diff -ruw linux-3.6.7/arch/arm/include/asm/setup.h linux-3.6.7-fbx/arch/arm/include/asm/setup.h --- linux-3.6.7/arch/arm/include/asm/setup.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/include/asm/setup.h 2014-04-17 16:28:01.640871080 +0200 @@ -143,6 +143,37 @@ __u32 fmemclk; }; +/* + * bootloader version + */ +#define ATAG_LOADER_VERSION 0x41000045 +struct tag_loader_version { + char version[1]; +}; + +/* + * freebox serial info, make RMK cry a bit more :( + */ +#include +#define ATAG_FBXSERIAL 0x41000044 +struct tag_fbxserial { + struct fbx_serial serial; +}; + +/* + * boot_info tag, used by bank0 in conjuction with fbxhwinfo to + * sortout whether: + * + * - user forced a bank0 boot + * - user forced a bank0 boot _and_ asked for nvram to be erased. + */ +#define ATAG_BOOT_INFO 0x41000046 +struct tag_boot_info { + u32 erase_nvram; /* == 1 if user selected nvram erase */ + u32 bank0_forced; /* == 1 if bank0 boot was + forced by user*/ +}; + struct tag { struct tag_header hdr; union { @@ -165,6 +196,13 @@ * DC21285 specific */ struct tag_memclk memclk; + + /* + * Freebox specific + */ + struct tag_loader_version loader_version; + struct tag_fbxserial fbxserial; + struct tag_boot_info boot_info; } u; }; diff -ruw linux-3.6.7/arch/arm/include/asm/socket.h linux-3.6.7-fbx/arch/arm/include/asm/socket.h --- linux-3.6.7/arch/arm/include/asm/socket.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/include/asm/socket.h 2014-04-17 16:28:01.644871157 +0200 @@ -69,4 +69,6 @@ /* Instruct lower device to use last 4-bytes of skb data as FCS */ #define SO_NOFCS 43 +#define SO_UDP_DUP_UNICAST 44 + #endif /* _ASM_SOCKET_H */ diff -ruw linux-3.6.7/arch/arm/include/asm/syscall.h linux-3.6.7-fbx/arch/arm/include/asm/syscall.h --- linux-3.6.7/arch/arm/include/asm/syscall.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/include/asm/syscall.h 2014-04-17 16:28:01.652871311 +0200 @@ -8,6 +8,8 @@ #define _ASM_ARM_SYSCALL_H #include +#include +#include #include extern const unsigned long sys_call_table[]; @@ -91,4 +93,11 @@ memcpy(®s->ARM_r0 + i, args, n * sizeof(args[0])); } +static inline int syscall_get_arch(struct task_struct *task, + struct pt_regs *regs) +{ + /* FIXME : handle ARMEB here. */ + return AUDIT_ARCH_ARM; +} + #endif /* _ASM_ARM_SYSCALL_H */ diff -ruw linux-3.6.7/arch/arm/Kconfig linux-3.6.7-fbx/arch/arm/Kconfig --- linux-3.6.7/arch/arm/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/Kconfig 2014-04-17 17:28:40.220718501 +0200 @@ -43,12 +43,14 @@ select CPU_PM if (SUSPEND || CPU_IDLE) select GENERIC_PCI_IOMAP select HAVE_BPF_JIT + select HAVE_SECCOMP_FILTER_JIT select GENERIC_SMP_IDLE_THREAD select KTIME_SCALAR select GENERIC_CLOCKEVENTS_BROADCAST if SMP select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN + select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT) help The ARM series is a line of low-power-consumption RISC chip designs licensed by ARM Ltd and targeted at embedded applications and @@ -1485,6 +1487,10 @@ source "drivers/pci/Kconfig" +source "drivers/pci/hotplug/Kconfig" + +source "drivers/pci/pcie/Kconfig" + source "drivers/pcmcia/Kconfig" endmenu @@ -2331,6 +2337,13 @@ config ARM_CPU_SUSPEND def_bool PM_SLEEP +config ARM_BPF_JIT_HARDEN + bool "ARM BPF JIT Hardening" + depends on BPF_JIT + help + Harden BPF JIT generated code by xoring all 32bit constants + in the litteral pool with a runtime random-selected value. + endmenu source "net/Kconfig" diff -ruw linux-3.6.7/arch/arm/Kconfig.debug linux-3.6.7-fbx/arch/arm/Kconfig.debug --- linux-3.6.7/arch/arm/Kconfig.debug 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/Kconfig.debug 2014-04-17 16:28:01.424866918 +0200 @@ -381,6 +381,14 @@ kernel low-level debugging functions. Add earlyprintk to your kernel parameters to enable this console. +config DEBUG_LL_UART1 + bool "Use UART1 for low-level debugging" + depends on DEBUG_LL + help + Say Y here to use the second UART when enabling DEBUG_LL, if + your board does not have the first UART wired. This will + enlarge the uncompressed kernel size by exactly four bytes. + config OC_ETM bool "On-chip ETM and ETB" depends on ARM_AMBA diff -ruw linux-3.6.7/arch/arm/kernel/bios32.c linux-3.6.7-fbx/arch/arm/kernel/bios32.c --- linux-3.6.7/arch/arm/kernel/bios32.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/kernel/bios32.c 2014-04-17 16:28:01.676871773 +0200 @@ -627,3 +627,24 @@ return 0; } + +#ifdef CONFIG_HOTPLUG_PCI +/* + * pci hotplug won't map the irq for new devices, so use a fixup + * to work around this. + */ +void pci_fixup_hotplug_irq(struct pci_dev *dev) +{ + int irq; + + printk("pci_fixup_hotplug_irq.\n"); + + irq = pcibios_map_irq(dev, PCI_SLOT(dev->devfn), dev->pin); + if (irq == -1) + irq = 0; + dev->irq = irq; + pcibios_update_irq(dev, dev->irq); +} +DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_hotplug_irq); +#endif + diff -ruw linux-3.6.7/arch/arm/kernel/entry-common.S linux-3.6.7-fbx/arch/arm/kernel/entry-common.S --- linux-3.6.7/arch/arm/kernel/entry-common.S 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/kernel/entry-common.S 2014-04-17 16:28:01.676871773 +0200 @@ -409,9 +409,11 @@ tst r10, #_TIF_SECCOMP beq 1f mov r0, scno - bl __secure_computing + bl __arm_secure_computing + cmp r0, #0 add r0, sp, #S_R0 + S_OFF @ pointer to regs ldmia r0, {r0 - r3} @ have to reload r0 - r3 + blt __sys_failed_seccomp 1: #endif @@ -455,6 +457,12 @@ bl syscall_trace_exit b ret_slow_syscall +__sys_failed_seccomp: + ldr r0, [sp, #S_OFF + S_R0] @ put return value in r0 + @ ret_fast_syscall will not + @ restore pt_regs->ARM_r0 + b BSYM(ret_fast_syscall) @ we're out of here. + .align 5 #ifdef CONFIG_ALIGNMENT_TRAP .type __cr_alignment, #object diff -ruw linux-3.6.7/arch/arm/kernel/Makefile linux-3.6.7-fbx/arch/arm/kernel/Makefile --- linux-3.6.7/arch/arm/kernel/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/kernel/Makefile 2014-04-17 16:28:01.676871773 +0200 @@ -81,5 +81,6 @@ head-y := head$(MMUEXT).o obj-$(CONFIG_DEBUG_LL) += debug.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o +obj-$(CONFIG_SECCOMP) += seccomp.o extra-y := $(head-y) vmlinux.lds diff -ruw linux-3.6.7/arch/arm/mach-kirkwood/common.c linux-3.6.7-fbx/arch/arm/mach-kirkwood/common.c --- linux-3.6.7/arch/arm/mach-kirkwood/common.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/common.c 2014-04-17 16:28:02.428886260 +0200 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -234,7 +235,7 @@ void __init kirkwood_clk_init(void) { - struct clk *runit, *sata0, *sata1, *usb0, *sdio; + struct clk *runit, *sata0, *sata1, *usb0, *sdio, *tdm; struct clk *crypto, *xor0, *xor1, *pex0, *pex1, *audio; tclk = clk_register_fixed_rate(NULL, "tclk", NULL, @@ -257,7 +258,7 @@ pex1 = kirkwood_register_gate_fn("pex1", CGC_BIT_PEX1, NULL, disable_pcie1); audio = kirkwood_register_gate("audio", CGC_BIT_AUDIO); - kirkwood_register_gate("tdm", CGC_BIT_TDM); + tdm = kirkwood_register_gate("tdm", CGC_BIT_TDM); kirkwood_register_gate("tsu", CGC_BIT_TSU); /* clkdev entries, mapping clks to devices */ @@ -266,9 +267,11 @@ orion_clkdev_add(NULL, MV643XX_ETH_NAME ".0", ge0); orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", ge1); orion_clkdev_add(NULL, "orion_wdt", tclk); + orion_clkdev_add(NULL, "orion_fbxwdt", tclk); orion_clkdev_add("0", "sata_mv.0", sata0); orion_clkdev_add("1", "sata_mv.0", sata1); orion_clkdev_add(NULL, "orion-ehci.0", usb0); + orion_clkdev_add(NULL, "fsl-usb2-udc.0", usb0); orion_clkdev_add(NULL, "orion_nand", runit); orion_clkdev_add(NULL, "mvsdio", sdio); orion_clkdev_add(NULL, "mv_crypto", crypto); @@ -278,6 +281,7 @@ orion_clkdev_add("1", "pcie", pex1); orion_clkdev_add(NULL, "kirkwood-i2s", audio); orion_clkdev_add(NULL, MV64XXX_I2C_CTLR_NAME ".0", runit); + orion_clkdev_add(NULL, "orion_tdm_spi.0", tdm); /* Marvell says runit is used by SPI, UART, NAND, TWSI, ..., * so should never be gated. @@ -290,7 +294,23 @@ ****************************************************************************/ void __init kirkwood_ehci_init(void) { - orion_ehci_init(USB_PHYS_BASE, IRQ_KIRKWOOD_USB, EHCI_PHY_NA); + u32 val; + + /* Analog Group Configuration Register */ + val = readl(DEV_BUS_VIRT_BASE + 0x7c); + val &= ~(0x3 << 3); + val |= (0x1 << 3); + writel(val, DEV_BUS_VIRT_BASE + 0x7c); + + orion_ehci_init(USB_PHYS_BASE, IRQ_KIRKWOOD_USB, EHCI_PHY_KW); +} + +/***************************************************************************** + * UDC + ****************************************************************************/ +void __init kirkwood_udc_init(void) +{ + orion_udc_init(USB_PHYS_BASE, IRQ_KIRKWOOD_USB); } @@ -361,6 +381,7 @@ kirkwood_nand_data.parts = parts; kirkwood_nand_data.nr_parts = nr_parts; kirkwood_nand_data.chip_delay = chip_delay; + kirkwood_nand_data.ecc = NAND_ECC_SOFT; platform_device_register(&kirkwood_nand_flash); } @@ -373,6 +394,24 @@ platform_device_register(&kirkwood_nand_flash); } +void __init kirkwood_nand_init_ecc(struct mtd_partition *parts, int nr_parts, + int chip_delay, struct kirkwood_nand_ecc *ecc) +{ + if (!ecc) { + kirkwood_nand_data.ecc = NAND_ECC_SOFT; + kirkwood_nand_data.bch_ecc_size = + kirkwood_nand_data.bch_ecc_bytes = 0; + } else { + kirkwood_nand_data.ecc = ecc->ecc; + kirkwood_nand_data.bch_ecc_bytes = ecc->bch_ecc_bytes; + kirkwood_nand_data.bch_ecc_size = ecc->bch_ecc_size; + } + kirkwood_nand_data.parts = parts; + kirkwood_nand_data.nr_parts = nr_parts; + kirkwood_nand_data.chip_delay = chip_delay; + platform_device_register(&kirkwood_nand_flash); +} + /***************************************************************************** * SoC RTC ****************************************************************************/ @@ -442,15 +481,58 @@ orion_spi_init(SPI_PHYS_BASE); } +/***************************************************************************** + * TDM SPI + ****************************************************************************/ +static struct orion_tdm_spi_info kirkwood_tdm_spi_plat_data = { +}; + +static struct resource kirkwood_tdm_spi_resources[] = { + { + .start = TDM_SPI_PHYS_BASE, + .end = TDM_SPI_PHYS_BASE + SZ_64K - 1, + .flags = IORESOURCE_MEM, + }, +}; + +static struct platform_device kirkwood_tdm_spi = { + .name = "orion_tdm_spi", + .id = 0, + .resource = kirkwood_tdm_spi_resources, + .dev = { + .platform_data = &kirkwood_tdm_spi_plat_data, + }, + .num_resources = ARRAY_SIZE(kirkwood_tdm_spi_resources), +}; + +void __init kirkwood_tdm_spi_init(int *cs_gpio) +{ + memcpy(kirkwood_tdm_spi_plat_data.cs_use_gpio, cs_gpio, + sizeof (kirkwood_tdm_spi_plat_data.cs_use_gpio)); + platform_device_register(&kirkwood_tdm_spi); +} + /***************************************************************************** * I2C ****************************************************************************/ -void __init kirkwood_i2c_init(void) +void __init kirkwood_i2c_init(unsigned int freq_m, unsigned int freq_n) { - orion_i2c_init(I2C_PHYS_BASE, IRQ_KIRKWOOD_TWSI, 8); + /* + * FYI + * + * Fscl = Ftclk / (10 * (freq_m + 1) * 2 ^ (freq_n + 1)) + * + * 0 <= M <= 15 + * 0 <= N <= 7 + */ + orion_i2c_init(I2C_PHYS_BASE, IRQ_KIRKWOOD_TWSI, freq_m, freq_n); } +void __init kirkwood_i2c1_init(unsigned int freq_m, unsigned int freq_n) +{ + orion_i2c_1_init(I2C1_PHYS_BASE, IRQ_KIRKWOOD_TWSI1, freq_m, freq_n); +} /***************************************************************************** * UART0 @@ -595,6 +677,28 @@ } /***************************************************************************** + * Temperature sensor + ****************************************************************************/ +static struct resource kirkwood_coretemp_resources[] = { + [0] = { + .start = TEMP_PHYS_BASE, + .end = TEMP_PHYS_BASE + sizeof (u32) - 1, + .flags = IORESOURCE_MEM, + }, +}; +struct platform_device kirkwood_coretemp_device = { + .name = "kirkwood-coretemp", + .id = -1, + .num_resources = ARRAY_SIZE(kirkwood_coretemp_resources), + .resource = kirkwood_coretemp_resources, +}; + +static void __init kirkwood_coretemp_init(void) +{ + platform_device_register(&kirkwood_coretemp_device); +} + +/***************************************************************************** * General ****************************************************************************/ /* @@ -654,8 +758,26 @@ #endif } +/* + * implement workaround for FE-MISC-120 entry in errata document: + * "Miscellaneous Register Setting in an Undocumented Register" + */ +static void __init kirkwood_fe_misc_120(void) +{ + u32 reg = readl(BRIDGE_VIRT_BASE + 0x100e4); + reg |= (3 << 25); + writel(reg, BRIDGE_VIRT_BASE + 0x100e4); +} + void __init kirkwood_init(void) { + u32 dev, rev; + + kirkwood_pcie_id(&dev, &rev); + + if (dev == MV88F6282_DEV_ID) + kirkwood_fe_misc_120(); + printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk); @@ -682,6 +804,8 @@ kirkwood_xor0_init(); kirkwood_xor1_init(); kirkwood_crypto_init(); + if (dev == MV88F6282_DEV_ID) + kirkwood_coretemp_init(); #ifdef CONFIG_KEXEC kexec_reinit = kirkwood_enable_pcie; diff -ruw linux-3.6.7/arch/arm/mach-kirkwood/common.h linux-3.6.7-fbx/arch/arm/mach-kirkwood/common.h --- linux-3.6.7/arch/arm/mach-kirkwood/common.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/common.h 2014-04-17 16:28:02.428886260 +0200 @@ -22,6 +22,12 @@ #define KW_PCIE0 (1 << 0) #define KW_PCIE1 (1 << 1) +struct kirkwood_nand_ecc { + u8 ecc; + u16 bch_ecc_size; + u16 bch_ecc_bytes; +}; + /* * Basic Kirkwood init functions used early by machine-setup. */ @@ -43,11 +49,15 @@ void kirkwood_sata_init(struct mv_sata_platform_data *sata_data); void kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data); void kirkwood_spi_init(void); -void kirkwood_i2c_init(void); +void kirkwood_tdm_spi_init(int cs_gpio[2]); +void kirkwood_i2c_init(unsigned int freq_m, unsigned int freq_n); +void kirkwood_i2c1_init(unsigned int freq_m, unsigned int freq_n); void kirkwood_uart0_init(void); void kirkwood_uart1_init(void); void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay); void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, int (*dev_ready)(struct mtd_info *)); +void kirkwood_nand_init_ecc(struct mtd_partition *parts, int nr_parts, + int delay, struct kirkwood_nand_ecc *ecc); void kirkwood_audio_init(void); void kirkwood_restart(char, const char *); void kirkwood_clk_init(void); @@ -101,6 +111,7 @@ void kirkwood_xor0_init(void); void kirkwood_xor1_init(void); void kirkwood_crypto_init(void); +void kirkwood_udc_init(void); extern int kirkwood_tclk; extern struct sys_timer kirkwood_timer; diff -ruw linux-3.6.7/arch/arm/mach-kirkwood/include/mach/bridge-regs.h linux-3.6.7-fbx/arch/arm/mach-kirkwood/include/mach/bridge-regs.h --- linux-3.6.7/arch/arm/mach-kirkwood/include/mach/bridge-regs.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/include/mach/bridge-regs.h 2014-04-17 16:28:02.440886492 +0200 @@ -17,7 +17,9 @@ #define CPU_CONFIG_ERROR_PROP 0x00000004 #define CPU_CONTROL (BRIDGE_VIRT_BASE | 0x0104) +#define PCIE0_ENABLE 0x00000001 #define CPU_RESET 0x00000002 +#define PCIE1_ENABLE 0x00000010 #define RSTOUTn_MASK (BRIDGE_VIRT_BASE | 0x0108) #define WDT_RESET_OUT_EN 0x00000002 diff -ruw linux-3.6.7/arch/arm/mach-kirkwood/include/mach/irqs.h linux-3.6.7-fbx/arch/arm/mach-kirkwood/include/mach/irqs.h --- linux-3.6.7/arch/arm/mach-kirkwood/include/mach/irqs.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/include/mach/irqs.h 2013-09-03 14:19:32.486089364 +0200 @@ -40,6 +40,7 @@ /* * High Interrupt Controller */ +#define IRQ_KIRKWOOD_TWSI1 32 #define IRQ_KIRKWOOD_UART_0 33 #define IRQ_KIRKWOOD_UART_1 34 #define IRQ_KIRKWOOD_GPIO_LOW_0_7 35 diff -ruw linux-3.6.7/arch/arm/mach-kirkwood/include/mach/kirkwood.h linux-3.6.7-fbx/arch/arm/mach-kirkwood/include/mach/kirkwood.h --- linux-3.6.7/arch/arm/mach-kirkwood/include/mach/kirkwood.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/include/mach/kirkwood.h 2014-04-17 16:28:02.440886492 +0200 @@ -67,13 +67,20 @@ #define DEV_BUS_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x10000) #define DEV_BUS_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x10000) +#define MPP_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x0000) #define SAMPLE_AT_RESET (DEV_BUS_VIRT_BASE | 0x0030) #define DEVICE_ID (DEV_BUS_VIRT_BASE | 0x0034) #define GPIO_LOW_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x0100) #define GPIO_HIGH_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x0140) #define RTC_PHYS_BASE (DEV_BUS_PHYS_BASE | 0x0300) +#define NAND_PHYS_BASE (DEV_BUS_PHYS_BASE | 0x0400) +#define NAND_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x0400) +#define NAND_RD_PARAM_OFF 0x0018 +#define NAND_WR_PARAM_OFF 0x001C +#define NAND_FLASH_CTL_OFF 0x0070 #define SPI_PHYS_BASE (DEV_BUS_PHYS_BASE | 0x0600) #define I2C_PHYS_BASE (DEV_BUS_PHYS_BASE | 0x1000) +#define I2C1_PHYS_BASE (DEV_BUS_PHYS_BASE | 0x1100) #define UART0_PHYS_BASE (DEV_BUS_PHYS_BASE | 0x2000) #define UART0_VIRT_BASE (DEV_BUS_VIRT_BASE | 0x2000) #define UART1_PHYS_BASE (DEV_BUS_PHYS_BASE | 0x2100) @@ -117,6 +124,11 @@ #define AUDIO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0xA0000) #define AUDIO_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0xA0000) +#define TDM_SPI_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0xd0000) +#define TDM_SPI_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0xd0000) + +#define TEMP_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x10078) + /* * Supported devices and revisions. */ diff -ruw linux-3.6.7/arch/arm/mach-kirkwood/irq.c linux-3.6.7-fbx/arch/arm/mach-kirkwood/irq.c --- linux-3.6.7/arch/arm/mach-kirkwood/irq.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/irq.c 2014-04-17 16:28:02.440886492 +0200 @@ -12,6 +12,7 @@ #include #include #include +#include "common.h" static int __initdata gpio0_irqs[4] = { IRQ_KIRKWOOD_GPIO_LOW_0_7, @@ -29,6 +30,13 @@ void __init kirkwood_init_irq(void) { + u32 dev, rev; + + kirkwood_pcie_id(&dev, &rev); + if (dev == MV88F6282_DEV_ID) + /* see FE-MISC-70 in errata document */ + orion_gpio_mpp33_fix_needed(); + orion_irq_init(0, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF)); orion_irq_init(32, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF)); diff -ruw linux-3.6.7/arch/arm/mach-kirkwood/Kconfig linux-3.6.7-fbx/arch/arm/mach-kirkwood/Kconfig --- linux-3.6.7/arch/arm/mach-kirkwood/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/Kconfig 2014-04-17 16:28:02.424886184 +0200 @@ -195,6 +195,79 @@ Say 'Y' here if you want your kernel to support the HP t5325 Thin Client. +config MACH_FBXGW1R + bool "Freebox Gateway version 1" + select FBXSERIAL + select FBXGW_COMMON + +config MACH_FBXGW1R_ETHSW_CONFIG + bool "initialize ethernet switch" + depends on MACH_FBXGW1R + +config MACH_FBXGW1R_ETHSW_CONFIG_VLAN + bool "setup vlan" + depends on MACH_FBXGW1R_ETHSW_CONFIG + +config MACH_FBXGW1R_EXPANSION_BOARD_SETUP + bool "setup expansion board early" + depends on MACH_FBXGW1R + +config MACH_FBXGW2R + bool "Freebox Gateway version 2" + select FBXSERIAL + select FBXGW_COMMON + +config MACH_FBXGW2R_ETHSW_CONFIG + bool "initialise ethernet switch" + depends on MACH_FBXGW2R + +config MACH_FBXGW2R_ETHSW_CONFIG_VLAN + bool "setup vlan" + depends on MACH_FBXGW2R + +config MACH_FBXGW2R_EXPANSION_BOARD_SETUP + bool "setup expansion board early" + depends on MACH_FBXGW2R + +config FBXGW_COMMON + bool + +if FBXGW_COMMON + +config FBXGW_COMMON_PARTS_WRITE_ALL + bool "make all mtd partitions writeable" + +config FBXGW_COMMON_NAND_SAFE_READ_TIMINGS + bool "use very conservative timings for nand read" + +config FBXGW_COMMON_NAND_SAFE_WRITE_TIMINGS + bool "use very conservative timings for nand write" + +choice + prompt "i2c bus speed" + default FBXGW_COMMON_I2C_25K + +config FBXGW_COMMON_I2C_25K + bool "25KHz" + +config FBXGW_COMMON_I2C_50K + bool "50KHz" + +config FBXGW_COMMON_I2C_100K + bool "100KHz" + +endchoice + +endif + + +config MACH_RD88F6282A + bool "Marvell RD-88F6282-A Reference Design" + +config MACH_DB88F6282A_BP + bool "Marvell DB-88F6282-A-BP Reference Design" + endmenu endif + diff -ruw linux-3.6.7/arch/arm/mach-kirkwood/Makefile linux-3.6.7-fbx/arch/arm/mach-kirkwood/Makefile --- linux-3.6.7/arch/arm/mach-kirkwood/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/Makefile 2014-04-17 16:28:02.424886184 +0200 @@ -18,6 +18,12 @@ obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o obj-$(CONFIG_MACH_T5325) += t5325-setup.o +obj-$(CONFIG_MACH_FBXGW1R) += fbxgw1r-setup.o fbxgw-common.o \ + fbxgw-switch.o +obj-$(CONFIG_MACH_FBXGW2R) += fbxgw2r-setup.o fbxgw-common.o \ + fbxgw-switch.o +obj-$(CONFIG_MACH_RD88F6282A) += rd88f6282a-setup.o +obj-$(CONFIG_MACH_DB88F6282A_BP) += db88f6282a-bp-setup.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o diff -ruw linux-3.6.7/arch/arm/mach-kirkwood/pcie.c linux-3.6.7-fbx/arch/arm/mach-kirkwood/pcie.c --- linux-3.6.7/arch/arm/mach-kirkwood/pcie.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/pcie.c 2014-04-17 16:28:02.440886492 +0200 @@ -258,7 +258,16 @@ return bus; } -static int __init kirkwood_pcie_map_irq(const struct pci_dev *dev, u8 slot, +static void __init kirkwood_pcie_preinit(void) +{ + /* + * clear PCI_REASSIGN_ALL_RSRC bit as it brings pain and + * suffering during PCI rescan. + */ + pci_clear_flags(PCI_REASSIGN_ALL_RSRC); +} + +static int kirkwood_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { struct pci_sys_data *sys = dev->sysdata; @@ -271,17 +280,16 @@ .setup = kirkwood_pcie_setup, .scan = kirkwood_pcie_scan_bus, .map_irq = kirkwood_pcie_map_irq, + .preinit = kirkwood_pcie_preinit, }; static void __init add_pcie_port(int index, unsigned long base) { printk(KERN_INFO "Kirkwood PCIe port %d: ", index); - if (orion_pcie_link_up((void __iomem *)base)) { - printk(KERN_INFO "link up\n"); pcie_port_map[num_pcie_ports++] = index; - } else - printk(KERN_INFO "link down, ignoring\n"); + pr_info("Kirkwood PCIe port %d: link %s\n", index, + orion_pcie_link_up(base) ? "up" : "down"); } void __init kirkwood_pcie_init(unsigned int portmask) diff -ruw linux-3.6.7/arch/arm/mm/alignment.c linux-3.6.7-fbx/arch/arm/mm/alignment.c --- linux-3.6.7/arch/arm/mm/alignment.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/mm/alignment.c 2014-04-17 16:28:02.980896895 +0200 @@ -750,7 +750,6 @@ unsigned long instr = 0, instrptr; int (*handler)(unsigned long addr, unsigned long instr, struct pt_regs *regs); unsigned int type; - mm_segment_t fs; unsigned int fault; u16 tinstr = 0; int isize = 4; @@ -761,16 +760,15 @@ instrptr = instruction_pointer(regs); - fs = get_fs(); - set_fs(KERNEL_DS); if (thumb_mode(regs)) { - fault = __get_user(tinstr, (u16 *)(instrptr & ~1)); + u16 *ptr = (u16 *)(instrptr & ~1); + fault = probe_kernel_address(ptr, tinstr); if (!fault) { if (cpu_architecture() >= CPU_ARCH_ARMv7 && IS_T32(tinstr)) { /* Thumb-2 32-bit */ u16 tinst2 = 0; - fault = __get_user(tinst2, (u16 *)(instrptr+2)); + fault = probe_kernel_address(ptr + 1, tinst2); instr = (tinstr << 16) | tinst2; thumb2_32b = 1; } else { @@ -779,8 +777,7 @@ } } } else - fault = __get_user(instr, (u32 *)instrptr); - set_fs(fs); + fault = probe_kernel_address(instrptr, instr); if (fault) { type = TYPE_FAULT; diff -ruw linux-3.6.7/arch/arm/net/bpf_jit_32.c linux-3.6.7-fbx/arch/arm/net/bpf_jit_32.c --- linux-3.6.7/arch/arm/net/bpf_jit_32.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/net/bpf_jit_32.c 2014-04-17 16:28:02.992897126 +0200 @@ -40,9 +40,10 @@ #define r_skb ARM_R6 #define r_skb_data ARM_R7 #define r_skb_hl ARM_R8 +#define r_scramble ARM_R10 #define SCRATCH_SP_OFFSET 0 -#define SCRATCH_OFF(k) (SCRATCH_SP_OFFSET + (k)) +#define SCRATCH_OFF(k) (SCRATCH_SP_OFFSET + 4 * (k)) #define SEEN_MEM ((1 << BPF_MEMWORDS) - 1) #define SEEN_MEM_WORD(k) (1 << (k)) @@ -50,11 +51,13 @@ #define SEEN_CALL (1 << (BPF_MEMWORDS + 1)) #define SEEN_SKB (1 << (BPF_MEMWORDS + 2)) #define SEEN_DATA (1 << (BPF_MEMWORDS + 3)) +#define SEEN_IMM (1 << (BPF_MEMWORDS + 4)) #define FLAG_NEED_X_RESET (1 << 0) struct jit_ctx { - const struct sk_filter *skf; + unsigned short prog_len; + struct sock_filter *prog_insns; unsigned idx; unsigned prologue_bytes; int ret0_fp_idx; @@ -66,11 +69,16 @@ u16 epilogue_bytes; u16 imm_count; u32 *imms; +#ifdef CONFIG_ARM_BPF_JIT_HARDEN + u32 scramble_key; +#endif #endif }; int bpf_jit_enable __read_mostly; +static inline void emit_mov_i_no8m(int rd, u32 val, struct jit_ctx *ctx); + static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset) { u8 ret; @@ -130,8 +138,8 @@ { u16 ret = 0; - if ((ctx->skf->len > 1) || - (ctx->skf->insns[0].code == BPF_S_RET_A)) + if ((ctx->prog_len > 1) || + (ctx->prog_insns[0].code == BPF_S_RET_A)) ret |= 1 << r_A; #ifdef CONFIG_FRAME_POINTER @@ -146,6 +154,10 @@ ret |= (1 << r_skb_data) | (1 << r_skb_hl); if (ctx->seen & SEEN_X) ret |= 1 << r_X; +#if __LINUX_ARM_ARCH__ < 7 && defined(CONFIG_ARM_BPF_JIT_HARDEN) + if (ctx->seen & SEEN_IMM) + ret |= 1 << r_scramble; +#endif return ret; } @@ -178,7 +190,7 @@ static void build_prologue(struct jit_ctx *ctx) { u16 reg_set = saved_regs(ctx); - u16 first_inst = ctx->skf->insns[0].code; + u16 first_inst = ctx->prog_insns[0].code; u16 off; #ifdef CONFIG_FRAME_POINTER @@ -214,6 +226,12 @@ /* stack space for the BPF_MEM words */ if (ctx->seen & SEEN_MEM) emit(ARM_SUB_I(ARM_SP, ARM_SP, mem_words_used(ctx) * 4), ctx); + +#if __LINUX_ARM_ARCH__ < 7 && defined(CONFIG_ARM_BPF_JIT_HARDEN) + if (ctx->seen & SEEN_IMM) + /* load scramble key once and for all in r_scramble */ + emit_mov_i_no8m(r_scramble, ctx->scramble_key, ctx); +#endif } static void build_epilogue(struct jit_ctx *ctx) @@ -276,7 +294,7 @@ ctx->imms[i] = k; /* constants go just after the epilogue */ - offset = ctx->offsets[ctx->skf->len]; + offset = ctx->offsets[ctx->prog_len]; offset += ctx->prologue_bytes; offset += ctx->epilogue_bytes; offset += i * 4; @@ -311,8 +329,20 @@ if (imm12 >= 0) emit(ARM_MOV_I(rd, imm12), ctx); - else + else { +#if __LINUX_ARM_ARCH__ < 7 && defined(CONFIG_ARM_BPF_JIT_HARDEN) + /* + * put the scrambled value in the literal pool, and + * emit a xor to unscramble the value after the load + * from the literal pool. + */ + ctx->seen |= SEEN_IMM; + emit_mov_i_no8m(rd, val ^ ctx->scramble_key, ctx); + emit(ARM_EOR_R(rd, rd, r_scramble), ctx); +#else emit_mov_i_no8m(rd, val, ctx); +#endif + } } #if __LINUX_ARM_ARCH__ < 6 @@ -338,10 +368,17 @@ static inline void emit_swap16(u8 r_dst, u8 r_src, struct jit_ctx *ctx) { - emit(ARM_LSL_R(ARM_R1, r_src, 8), ctx); - emit(ARM_ORR_S(r_dst, ARM_R1, r_src, SRTYPE_LSL, 8), ctx); - emit(ARM_LSL_I(r_dst, r_dst, 8), ctx); - emit(ARM_LSL_R(r_dst, r_dst, 8), ctx); + /* r_dst = (r_src << 8) | (r_src >> 8) */ + emit(ARM_LSL_I(ARM_R1, r_src, 8), ctx); + emit(ARM_ORR_S(r_dst, ARM_R1, r_src, SRTYPE_LSR, 8), ctx); + + /* + * we need to mask out the bits set in r_dst[23:16] due to + * the first shift instruction. + * + * note that 0x8ff is the encoded immediate 0x00ff0000. + */ + emit(ARM_BIC_I(r_dst, r_dst, 0x8ff), ctx); } #else /* ARMv6+ */ @@ -409,7 +446,7 @@ emit(ARM_MOV_R(ARM_R0, ARM_R0), ctx); } else { _emit(cond, ARM_MOV_I(ARM_R0, 0), ctx); - _emit(cond, ARM_B(b_imm(ctx->skf->len, ctx)), ctx); + _emit(cond, ARM_B(b_imm(ctx->prog_len, ctx)), ctx); } } @@ -459,14 +496,13 @@ static int build_body(struct jit_ctx *ctx) { void *load_func[] = {jit_get_skb_b, jit_get_skb_h, jit_get_skb_w}; - const struct sk_filter *prog = ctx->skf; const struct sock_filter *inst; unsigned i, load_order, off, condt; int imm12; u32 k; - for (i = 0; i < prog->len; i++) { - inst = &(prog->insns[i]); + for (i = 0; i < ctx->prog_len; i++) { + inst = &(ctx->prog_insns[i]); /* K as an immediate value operand */ k = inst->k; @@ -538,6 +574,15 @@ emit_err_ret(ARM_COND_NE, ctx); emit(ARM_MOV_R(r_A, ARM_R0), ctx); break; +#ifdef CONFIG_SECCOMP_FILTER_JIT + case BPF_S_ANC_SECCOMP_LD_W: + ctx->seen |= SEEN_CALL; + emit_mov_i(ARM_R3, (u32)seccomp_bpf_load, ctx); + emit_mov_i(ARM_R0, k, ctx); + emit_blx_r(ARM_R3, ctx); + emit(ARM_MOV_R(r_A, ARM_R0), ctx); + break; +#endif case BPF_S_LD_W_IND: load_order = 2; goto load_ind; @@ -566,7 +611,7 @@ /* x = ((*(frame + k)) & 0xf) << 2; */ ctx->seen |= SEEN_X | SEEN_DATA | SEEN_CALL; /* the interpreter should deal with the negative K */ - if (k < 0) + if ((int)k < 0) return -1; /* offset in r1: we might have to take the slow path */ emit_mov_i(r_off, k, ctx); @@ -650,6 +695,10 @@ /* A &= K */ OP_IMM3(ARM_AND, r_A, r_A, k, ctx); break; + case BPF_S_ALU_XOR_K: + /* A ^= K */ + OP_IMM3(ARM_EOR, r_A, r_A, k, ctx); + break; case BPF_S_ALU_AND_X: update_on_xread(ctx); emit(ARM_AND_R(r_A, r_A, r_X), ctx); @@ -749,8 +798,8 @@ ctx->ret0_fp_idx = i; emit_mov_i(ARM_R0, k, ctx); b_epilogue: - if (i != ctx->skf->len - 1) - emit(ARM_B(b_imm(prog->len, ctx)), ctx); + if (i != ctx->prog_len - 1) + emit(ARM_B(b_imm(ctx->prog_len, ctx)), ctx); break; case BPF_S_MISC_TAX: /* X = A */ @@ -762,6 +811,7 @@ update_on_xread(ctx); emit(ARM_MOV_R(r_A, r_X), ctx); break; + case BPF_S_ALU_XOR_X: case BPF_S_ANC_ALU_XOR_X: /* A ^= X */ update_on_xread(ctx); @@ -832,7 +882,7 @@ } -void bpf_jit_compile(struct sk_filter *fp) +static void __bpf_jit_compile(struct jit_ctx *out_ctx) { struct jit_ctx ctx; unsigned tmp_idx; @@ -841,11 +891,14 @@ if (!bpf_jit_enable) return; - memset(&ctx, 0, sizeof(ctx)); - ctx.skf = fp; + ctx = *out_ctx; ctx.ret0_fp_idx = -1; - ctx.offsets = kzalloc(GFP_KERNEL, 4 * (ctx.skf->len + 1)); +#if __LINUX_ARM_ARCH__ < 7 && defined(CONFIG_ARM_BPF_JIT_HARDEN) + ctx.scramble_key = get_random_int(); +#endif + + ctx.offsets = kzalloc(4 * (ctx.prog_len + 1), GFP_KERNEL); if (ctx.offsets == NULL) return; @@ -864,7 +917,7 @@ ctx.idx += ctx.imm_count; if (ctx.imm_count) { - ctx.imms = kzalloc(GFP_KERNEL, 4 * ctx.imm_count); + ctx.imms = kzalloc(4 * ctx.imm_count, GFP_KERNEL); if (ctx.imms == NULL) goto out; } @@ -895,13 +948,26 @@ print_hex_dump(KERN_INFO, "BPF JIT code: ", DUMP_PREFIX_ADDRESS, 16, 4, ctx.target, alloc_size, false); - - fp->bpf_func = (void *)ctx.target; out: kfree(ctx.offsets); + + *out_ctx = ctx; return; } +void bpf_jit_compile(struct sk_filter *fp) +{ + struct jit_ctx ctx; + + memset(&ctx, 0, sizeof(ctx)); + ctx.prog_len = fp->len; + ctx.prog_insns = fp->insns; + + __bpf_jit_compile(&ctx); + if (ctx.target) + fp->bpf_func = (void*)ctx.target; +} + static void bpf_jit_free_worker(struct work_struct *work) { module_free(NULL, work); @@ -918,3 +984,30 @@ schedule_work(work); } } + +#ifdef CONFIG_SECCOMP_FILTER_JIT +void seccomp_jit_compile(struct seccomp_filter *fp) +{ + struct jit_ctx ctx; + + memset(&ctx, 0, sizeof(ctx)); + ctx.prog_len = fp->len; + ctx.prog_insns = fp->insns; + + __bpf_jit_compile(&ctx); + if (ctx.target) + fp->bpf_func = (void*)ctx.target; +} + +void seccomp_jit_free(struct seccomp_filter *fp) +{ + struct work_struct *work; + + if (fp->bpf_func != sk_run_filter) { + work = (struct work_struct *)fp->bpf_func; + + INIT_WORK(work, bpf_jit_free_worker); + schedule_work(work); + } +} +#endif diff -ruw linux-3.6.7/arch/arm/net/bpf_jit_32.h linux-3.6.7-fbx/arch/arm/net/bpf_jit_32.h --- linux-3.6.7/arch/arm/net/bpf_jit_32.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/net/bpf_jit_32.h 2013-08-28 11:43:15.564438980 +0200 @@ -69,6 +69,7 @@ #define ARM_INST_CMP_I 0x03500000 #define ARM_INST_EOR_R 0x00200000 +#define ARM_INST_EOR_I 0x02200000 #define ARM_INST_LDRB_I 0x05d00000 #define ARM_INST_LDRB_R 0x07d00000 @@ -135,6 +136,7 @@ #define ARM_CMP_I(rn, imm) _AL3_I(ARM_INST_CMP, 0, rn, imm) #define ARM_EOR_R(rd, rn, rm) _AL3_R(ARM_INST_EOR, rd, rn, rm) +#define ARM_EOR_I(rd, rn, imm) _AL3_I(ARM_INST_EOR, rd, rn, imm) #define ARM_LDR_I(rt, rn, off) (ARM_INST_LDR_I | (rt) << 12 | (rn) << 16 \ | (off)) diff -ruw linux-3.6.7/arch/arm/plat-orion/common.c linux-3.6.7-fbx/arch/arm/plat-orion/common.c --- linux-3.6.7/arch/arm/plat-orion/common.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/plat-orion/common.c 2014-04-17 16:28:03.080898821 +0200 @@ -18,10 +18,12 @@ #include #include #include +#include #include #include #include #include +#include /* Create a clkdev entry for a given device/clk */ void __init orion_clkdev_add(const char *con_id, const char *dev_id, @@ -531,9 +533,11 @@ void __init orion_i2c_init(unsigned long mapbase, unsigned long irq, - unsigned long freq_m) + unsigned long freq_m, + unsigned long freq_n) { orion_i2c_pdata.freq_m = freq_m; + orion_i2c_pdata.freq_n = freq_n; fill_resources(&orion_i2c, orion_i2c_resources, mapbase, SZ_32 - 1, irq); platform_device_register(&orion_i2c); @@ -885,6 +889,38 @@ platform_device_register(&orion_ehci_2); } + +/***************************************************************************** + * UDC + ****************************************************************************/ +static struct resource orion_udc_resources[2]; + +static struct fsl_usb2_platform_data orion_udc_data = { + .operating_mode = FSL_USB2_DR_DEVICE, + .phy_mode = FSL_USB2_PHY_UTMI, +}; + +static u64 otg_dmamask = DMA_BIT_MASK(32); + +/* OTG gadget device */ +struct platform_device orion_udc = { + .name = "fsl-usb2-udc", + .id = -1, + .dev = { + .dma_mask = &otg_dmamask, + .coherent_dma_mask = DMA_BIT_MASK(32), + .platform_data = &orion_udc_data, + }, +}; + +void __init orion_udc_init(unsigned long mapbase, unsigned long irq) +{ + fill_resources(&orion_udc, orion_udc_resources, mapbase, SZ_4K - 1, + irq); + platform_device_register(&orion_udc); +} + + /***************************************************************************** * SATA ****************************************************************************/ diff -ruw linux-3.6.7/arch/arm/plat-orion/gpio.c linux-3.6.7-fbx/arch/arm/plat-orion/gpio.c --- linux-3.6.7/arch/arm/plat-orion/gpio.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/plat-orion/gpio.c 2014-04-17 16:28:03.080898821 +0200 @@ -91,6 +91,7 @@ static struct orion_gpio_chip orion_gpio_chips[2]; static int orion_gpio_chip_count; +static int orion_gpio_mpp33_fix; static inline void __set_direction(struct orion_gpio_chip *ochip, unsigned pin, int input) @@ -208,6 +209,13 @@ spin_lock_irqsave(&ochip->lock, flags); __set_blinking(ochip, pin, 0); __set_level(ochip, pin, value); + if (pin == 1 && ochip == &orion_gpio_chips[1] && orion_gpio_mpp33_fix) { + /* + * MPP33 direction is controlled by MPP1 direction bit. + * see FE-MISC-70 in the errata datasheet. + */ + __set_direction(&orion_gpio_chips[0], 1, 0); + } else __set_direction(ochip, pin, 0); spin_unlock_irqrestore(&ochip->lock, flags); @@ -586,3 +594,8 @@ orion_gpio_of_init_one(np, irq_gpio_base); } #endif + +void orion_gpio_mpp33_fix_needed(void) +{ + orion_gpio_mpp33_fix = 1; +} diff -ruw linux-3.6.7/arch/arm/plat-orion/include/plat/common.h linux-3.6.7-fbx/arch/arm/plat-orion/include/plat/common.h --- linux-3.6.7/arch/arm/plat-orion/include/plat/common.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/plat-orion/include/plat/common.h 2014-04-17 16:28:03.080898821 +0200 @@ -63,11 +63,13 @@ void __init orion_i2c_init(unsigned long mapbase, unsigned long irq, - unsigned long freq_m); + unsigned long freq_m, + unsigned long freq_n); void __init orion_i2c_1_init(unsigned long mapbase, unsigned long irq, - unsigned long freq_m); + unsigned long freq_m, + unsigned long freq_n); void __init orion_spi_init(unsigned long mapbase); @@ -89,6 +91,8 @@ unsigned long irq, enum orion_ehci_phy_ver phy_version); +void __init orion_udc_init(unsigned long mapbase, unsigned long irq); + void __init orion_ehci_1_init(unsigned long mapbase, unsigned long irq); diff -ruw linux-3.6.7/arch/arm/plat-orion/include/plat/gpio.h linux-3.6.7-fbx/arch/arm/plat-orion/include/plat/gpio.h --- linux-3.6.7/arch/arm/plat-orion/include/plat/gpio.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/plat-orion/include/plat/gpio.h 2014-04-17 16:28:03.080898821 +0200 @@ -33,5 +33,13 @@ int secondary_irq_base, int irq[4]); +/* some CPUs require special handling for mpp33 direction */ +void __init orion_gpio_mpp33_fix_needed(void); + +/* + * GPIO interrupt handling. + */ +void orion_gpio_irq_handler(int irqoff); + void __init orion_gpio_of_init(int irq_gpio_base); #endif diff -ruw linux-3.6.7/arch/arm/plat-orion/include/plat/orion_nand.h linux-3.6.7-fbx/arch/arm/plat-orion/include/plat/orion_nand.h --- linux-3.6.7/arch/arm/plat-orion/include/plat/orion_nand.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/plat-orion/include/plat/orion_nand.h 2014-04-17 16:28:03.080898821 +0200 @@ -20,6 +20,9 @@ u8 cle; /* address line number connected to CLE */ u8 width; /* buswidth */ u8 chip_delay; + u8 ecc; + u16 bch_ecc_size; + u8 bch_ecc_bytes; }; diff -ruw linux-3.6.7/arch/arm/plat-orion/include/plat/pcie.h linux-3.6.7-fbx/arch/arm/plat-orion/include/plat/pcie.h --- linux-3.6.7/arch/arm/plat-orion/include/plat/pcie.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/plat-orion/include/plat/pcie.h 2013-09-03 14:19:32.546090510 +0200 @@ -16,6 +16,10 @@ u32 orion_pcie_dev_id(void __iomem *base); u32 orion_pcie_rev(void __iomem *base); int orion_pcie_link_up(void __iomem *base); +void orion_pcie_set_link_disable(void __iomem *base, int v); +void orion_pcie_set_retrain_link(void __iomem *base, int v); +int orion_pcie_get_link_training(void __iomem *base); +int orion_pcie_get_link_disable(void __iomem *base); int orion_pcie_x4_mode(void __iomem *base); int orion_pcie_get_local_bus_nr(void __iomem *base); void orion_pcie_set_local_bus_nr(void __iomem *base, int nr); diff -ruw linux-3.6.7/arch/arm/plat-orion/pcie.c linux-3.6.7-fbx/arch/arm/plat-orion/pcie.c --- linux-3.6.7/arch/arm/plat-orion/pcie.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/plat-orion/pcie.c 2014-04-17 16:28:03.084898898 +0200 @@ -24,6 +24,10 @@ #define PCIE_DEV_REV_OFF 0x0008 #define PCIE_BAR_LO_OFF(n) (0x0010 + ((n) << 3)) #define PCIE_BAR_HI_OFF(n) (0x0014 + ((n) << 3)) +#define PCIE_LINK_CTRL_OFF 0x0070 +#define PCIE_LINK_CTRL_LINK_DIS (1 << 4) +#define PCIE_LINK_CTRL_RETR_LINK (1 << 5) +#define PCIE_LINK_CTRL_LINK_TRAINING (1 << 27) #define PCIE_HEADER_LOG_4_OFF 0x0128 #define PCIE_BAR_CTRL_OFF(n) (0x1804 + ((n - 1) * 4)) #define PCIE_WIN04_CTRL_OFF(n) (0x1820 + ((n) << 4)) @@ -67,6 +71,49 @@ return !(readl(base + PCIE_STAT_OFF) & PCIE_STAT_LINK_DOWN); } +void orion_pcie_set_link_disable(void __iomem *base, int v) +{ + u32 val; + + val = readl(base + PCIE_LINK_CTRL_OFF); + if (v) + val |= PCIE_LINK_CTRL_LINK_DIS; + else + val &= ~PCIE_LINK_CTRL_LINK_DIS; + writel(val, base + PCIE_LINK_CTRL_OFF); +} + +int orion_pcie_get_link_disable(void __iomem *base) +{ + u32 val; + + val = readl(base + PCIE_LINK_CTRL_OFF); + if (val & PCIE_LINK_CTRL_LINK_DIS) + return 1; + return 0; +} + +void orion_pcie_set_retrain_link(void __iomem *base, int v) +{ + u32 val; + + val = readl(base + PCIE_LINK_CTRL_OFF); + if (v) + val |= PCIE_LINK_CTRL_RETR_LINK; + else + val &= ~PCIE_LINK_CTRL_RETR_LINK; + writel(val, base + PCIE_LINK_CTRL_OFF); +} + +int orion_pcie_get_link_training(void __iomem *base) +{ + u32 val = readl(base + PCIE_LINK_CTRL_OFF); + + if (val & PCIE_LINK_CTRL_LINK_TRAINING) + return 1; + return 0; +} + int __init orion_pcie_x4_mode(void __iomem *base) { return !(readl(base + PCIE_CTRL_OFF) & PCIE_CTRL_X1_MODE); diff -ruw linux-3.6.7/arch/arm/tools/mach-types linux-3.6.7-fbx/arch/arm/tools/mach-types --- linux-3.6.7/arch/arm/tools/mach-types 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/arm/tools/mach-types 2014-04-17 16:28:03.132899823 +0200 @@ -118,6 +118,7 @@ omap_osk MACH_OMAP_OSK OMAP_OSK 515 tosa MACH_TOSA TOSA 520 avila MACH_AVILA AVILA 526 +fbxgw1r MACH_FBXGW1R FBXGW1R 527 edb9302 MACH_EDB9302 EDB9302 538 husky MACH_HUSKY HUSKY 543 shepherd MACH_SHEPHERD SHEPHERD 545 @@ -1206,3 +1207,7 @@ familybox MACH_FAMILYBOX FAMILYBOX 4170 ensemble_mx35 MACH_ENSEMBLE_MX35 ENSEMBLE_MX35 4171 sc_sps_1 MACH_SC_SPS_1 SC_SPS_1 4172 +fbxgw2r MACH_FBXGW2R FBXGW2R 4242 +rd88f6282a MACH_RD88F6282A RD88F6282A 527 +# and another one ... +db88f6282a_bp MACH_DB88F6282A_BP DB88F6282A_BP 527 diff -ruw linux-3.6.7/arch/Kconfig linux-3.6.7-fbx/arch/Kconfig --- linux-3.6.7/arch/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/arch/Kconfig 2014-04-17 16:28:01.292864376 +0200 @@ -271,6 +271,10 @@ - secure_computing return value is checked and a return value of -1 results in the system call being skipped immediately. +# Used by archs to tell that they support SECCOMP_FILTER_JIT +config HAVE_SECCOMP_FILTER_JIT + bool + config SECCOMP_FILTER def_bool y depends on HAVE_ARCH_SECCOMP_FILTER && SECCOMP && NET @@ -281,4 +285,14 @@ See Documentation/prctl/seccomp_filter.txt for details. +config SECCOMP_FILTER_JIT + bool "enable Seccomp filter Just In Time compiler" + depends on HAVE_SECCOMP_FILTER_JIT && BPF_JIT && SECCOMP_FILTER + help + Seccomp syscall filtering capabilities are normally handled + by an interpreter. This option allows kernel to generate a native + code when filter is loaded in memory. This should speedup + syscall filtering. Note : Admin should enable this feature + changing /proc/sys/net/core/bpf_jit_enable + source "kernel/gcov/Kconfig" diff -ruw linux-3.6.7/crypto/algboss.c linux-3.6.7-fbx/crypto/algboss.c --- linux-3.6.7/crypto/algboss.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/crypto/algboss.c 2014-04-17 16:28:04.948934808 +0200 @@ -220,7 +220,9 @@ if (type & CRYPTO_ALG_TESTED) goto skiptest; +#ifdef CONFIG_CRYPTO_BUILTIN_TEST err = alg_test(param->driver, param->alg, type, CRYPTO_ALG_TESTED); +#endif skiptest: crypto_alg_tested(param->driver, err); diff -ruw linux-3.6.7/crypto/Kconfig linux-3.6.7-fbx/crypto/Kconfig --- linux-3.6.7/crypto/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/crypto/Kconfig 2014-04-17 16:28:04.948934808 +0200 @@ -86,6 +86,10 @@ tristate select CRYPTO_ALGAPI2 +config CRYPTO_BUILTIN_TEST + bool "Include builtin tests" + default y + config CRYPTO_MANAGER tristate "Cryptographic algorithm manager" select CRYPTO_MANAGER2 diff -ruw linux-3.6.7/crypto/Makefile linux-3.6.7-fbx/crypto/Makefile --- linux-3.6.7/crypto/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/crypto/Makefile 2014-04-17 16:28:04.948934808 +0200 @@ -28,7 +28,10 @@ obj-$(CONFIG_CRYPTO_PCOMP2) += pcompress.o -cryptomgr-y := algboss.o testmgr.o +cryptomgr-y := algboss.o +ifeq ($(CONFIG_CRYPTO_BUILTIN_TEST),y) +cryptomgr-y += testmgr.o +endif obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o obj-$(CONFIG_CRYPTO_USER) += crypto_user.o diff -ruw linux-3.6.7/drivers/ata/libata-core.c linux-3.6.7-fbx/drivers/ata/libata-core.c --- linux-3.6.7/drivers/ata/libata-core.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/ata/libata-core.c 2014-04-17 16:28:05.136938430 +0200 @@ -4107,6 +4107,8 @@ /* https://bugzilla.kernel.org/show_bug.cgi?id=15573 */ { "C300-CTFDDAC128MAG", "0001", ATA_HORKAGE_NONCQ, }, + { "Boot ROM", NULL, ATA_HORKAGE_NODMA }, + /* devices which puke on READ_NATIVE_MAX */ { "HDS724040KLSA80", "KFAOA20N", ATA_HORKAGE_BROKEN_HPA, }, { "WDC WD3200JD-00KLB0", "WD-WCAMR1130137", ATA_HORKAGE_BROKEN_HPA }, diff -ruw linux-3.6.7/drivers/ata/libata-eh.c linux-3.6.7-fbx/drivers/ata/libata-eh.c --- linux-3.6.7/drivers/ata/libata-eh.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/ata/libata-eh.c 2014-04-17 16:28:05.136938430 +0200 @@ -2092,7 +2092,7 @@ */ static inline int ata_eh_worth_retry(struct ata_queued_cmd *qc) { - if (qc->flags & AC_ERR_MEDIA) + if (qc->err_mask & AC_ERR_MEDIA) return 0; /* don't retry media errors */ if (qc->flags & ATA_QCFLAG_IO) return 1; /* otherwise retry anything from fs stack */ diff -ruw linux-3.6.7/drivers/ata/libata-scsi.c linux-3.6.7-fbx/drivers/ata/libata-scsi.c --- linux-3.6.7/drivers/ata/libata-scsi.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/ata/libata-scsi.c 2014-04-17 16:28:05.136938430 +0200 @@ -3400,7 +3400,7 @@ shost->max_host_blocked = 1; rc = scsi_add_host_with_dma(ap->scsi_host, - &ap->tdev, ap->host->dev); + host->dev, host->dev); if (rc) goto err_add; } diff -ruw linux-3.6.7/drivers/char/Kconfig linux-3.6.7-fbx/drivers/char/Kconfig --- linux-3.6.7/drivers/char/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/char/Kconfig 2014-04-17 16:28:05.284941281 +0200 @@ -15,6 +15,15 @@ kind of kernel debugging operations. When in doubt, say "N". +config DEVPHYSMEM + bool "/dev/physmem virtual device support" + default n + help + Say Y here if you want to support the /dev/physmem device. The + /dev/physmem device allows unprivileged access to physical memory + unused by the kernel. + When in doubt, say "N". + config STALDRV bool "Stallion multiport serial support" depends on SERIAL_NONSTANDARD diff -ruw linux-3.6.7/drivers/char/mem.c linux-3.6.7-fbx/drivers/char/mem.c --- linux-3.6.7/drivers/char/mem.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/char/mem.c 2014-04-17 16:28:05.372942976 +0200 @@ -356,6 +356,16 @@ } #endif +#ifdef CONFIG_DEVPHYSMEM +static int mmap_physmem(struct file * file, struct vm_area_struct * vma) +{ + if (vma->vm_pgoff < max_pfn && !capable(CAP_SYS_RAWIO)) + return -EPERM; + + return mmap_mem(file, vma); +} +#endif + #ifdef CONFIG_CRASH_DUMP /* * Read memory corresponding to the old kernel. @@ -734,6 +744,13 @@ return capable(CAP_SYS_RAWIO) ? 0 : -EPERM; } +#ifdef CONFIG_DEVPHYSMEM +static int open_physmem(struct inode * inode, struct file * filp) +{ + return 0; +} +#endif + #define zero_lseek null_lseek #define full_lseek null_lseek #define write_zero write_null @@ -809,6 +826,14 @@ }; #endif +#ifdef CONFIG_DEVPHYSMEM +static const struct file_operations physmem_fops = { + .mmap = mmap_physmem, + .open = open_physmem, + .get_unmapped_area = get_unmapped_area_mem, +}; +#endif + static const struct memdev { const char *name; umode_t mode; @@ -833,6 +858,9 @@ #ifdef CONFIG_CRASH_DUMP [12] = { "oldmem", 0, &oldmem_fops, NULL }, #endif +#ifdef CONFIG_DEVPHYSMEM + [16] = { "physmem", 0, &physmem_fops, &directly_mappable_cdev_bdi }, +#endif }; static int memory_open(struct inode *inode, struct file *filp) diff -ruw linux-3.6.7/drivers/hwmon/adt7475.c linux-3.6.7-fbx/drivers/hwmon/adt7475.c --- linux-3.6.7/drivers/hwmon/adt7475.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/hwmon/adt7475.c 2014-04-17 16:28:06.724969022 +0200 @@ -123,7 +123,19 @@ /* Macro to read the registers */ -#define adt7475_read(reg) i2c_smbus_read_byte_data(client, (reg)) +static inline s32 __adt7475_read(const struct i2c_client *client, u8 cmd) +{ + s32 ret; + + ret = i2c_smbus_read_byte_data(client, cmd); + if (ret < 0) { + printk("__adt7475_read error: %d\n", ret); + return 0; + } + return ret; +} + +#define adt7475_read(reg) __adt7475_read(client, (reg)) /* Macros to easily index the registers */ @@ -277,6 +289,9 @@ { u16 val; + if (need_resched()) + yield(); + val = i2c_smbus_read_byte_data(client, reg); val |= (i2c_smbus_read_byte_data(client, reg + 1) << 8); @@ -845,7 +860,7 @@ data->range[sattr->index] = adt7475_read(TEMP_TRANGE_REG(sattr->index)); - data->range[sattr->index] &= ~7; + data->range[sattr->index] &= ~0xf; data->range[sattr->index] |= out; i2c_smbus_write_byte_data(client, TEMP_TRANGE_REG(sattr->index), diff -ruw linux-3.6.7/drivers/hwmon/Kconfig linux-3.6.7-fbx/drivers/hwmon/Kconfig --- linux-3.6.7/drivers/hwmon/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/hwmon/Kconfig 2014-04-17 16:28:06.712968791 +0200 @@ -1411,6 +1411,10 @@ help Support for the A/D converter on MC13783 and MC13892 PMIC. +config SENSORS_KIRKWOOD_CORETEMP + tristate "Kirkwood core temperature censor" + depends on ARCH_KIRKWOOD + if ACPI comment "ACPI drivers" diff -ruw linux-3.6.7/drivers/hwmon/lm85.c linux-3.6.7-fbx/drivers/hwmon/lm85.c --- linux-3.6.7/drivers/hwmon/lm85.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/hwmon/lm85.c 2014-04-17 16:28:06.756969639 +0200 @@ -207,11 +207,11 @@ #define RANGE_FROM_REG(val) lm85_range_map[(val) & 0x0f] /* These are the PWM frequency encodings */ -static const int lm85_freq_map[8] = { /* 1 Hz */ - 10, 15, 23, 30, 38, 47, 61, 94 +static const int lm85_freq_map[11] = { /* 1 Hz */ + 10, 15, 23, 30, 38, 47, 61, 94, 94, 94, 94 }; -static const int adm1027_freq_map[8] = { /* 1 Hz */ - 11, 15, 22, 29, 35, 44, 59, 88 +static const int adm1027_freq_map[11] = { /* 1 Hz */ + 11, 15, 22, 29, 35, 44, 59, 88, 88, 88, 25000 }; static int FREQ_TO_REG(const int *map, int freq) @@ -219,7 +219,7 @@ int i; /* Find the closest match */ - for (i = 0; i < 7; ++i) + for (i = 0; i < 10; ++i) if (freq <= (map[i] + map[i + 1]) / 2) break; return i; @@ -227,7 +227,7 @@ static int FREQ_FROM_REG(const int *map, u8 reg) { - return map[reg & 0x07]; + return map[reg & 0x0f]; } /* @@ -1013,7 +1013,7 @@ TEMP_FROM_REG(data->zone[nr].limit)); lm85_write_value(client, LM85_REG_AFAN_RANGE(nr), ((data->zone[nr].range & 0x0f) << 4) - | (data->pwm_freq[nr] & 0x07)); + | (data->pwm_freq[nr] & 0x0f)); mutex_unlock(&data->update_lock); return count; @@ -1049,7 +1049,7 @@ val - min); lm85_write_value(client, LM85_REG_AFAN_RANGE(nr), ((data->zone[nr].range & 0x0f) << 4) - | (data->pwm_freq[nr] & 0x07)); + | (data->pwm_freq[nr] & 0x0f)); mutex_unlock(&data->update_lock); return count; } @@ -1240,8 +1240,28 @@ static void lm85_init_client(struct i2c_client *client) { + struct lm85_data *data = i2c_get_clientdata(client); int value; + /* workaround for emc2300 (emc6d103s), when auto temp min is + * the default value, pwm can never be controlled manually, so + * change this */ + if (data->type == emc6d103s) { + int nr; + + for (nr = 0; nr < 3; nr++) { + data->zone[nr].limit = TEMP_TO_REG(-127000); + lm85_write_value(client, LM85_REG_AFAN_LIMIT(nr), + data->zone[nr].limit); + + /* also force high frequency */ + data->pwm_freq[nr] = 0xa; + lm85_write_value(client, LM85_REG_AFAN_RANGE(nr), + data->pwm_freq[nr]); + } + } + + /* Start monitoring if needed */ value = lm85_read_value(client, LM85_REG_CONFIG); if (!(value & 0x01)) { @@ -1667,7 +1687,7 @@ data->autofan[i].config = lm85_read_value(client, LM85_REG_AFAN_CONFIG(i)); val = lm85_read_value(client, LM85_REG_AFAN_RANGE(i)); - data->pwm_freq[i] = val & 0x07; + data->pwm_freq[i] = val & 0x0f; data->zone[i].range = val >> 4; data->autofan[i].min_pwm = lm85_read_value(client, LM85_REG_AFAN_MINPWM(i)); diff -ruw linux-3.6.7/drivers/hwmon/Makefile linux-3.6.7-fbx/drivers/hwmon/Makefile --- linux-3.6.7/drivers/hwmon/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/hwmon/Makefile 2014-04-17 16:28:06.712968791 +0200 @@ -129,6 +129,7 @@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o +obj-$(CONFIG_SENSORS_KIRKWOOD_CORETEMP)+= kirkwood-coretemp.o obj-$(CONFIG_PMBUS) += pmbus/ diff -ruw linux-3.6.7/drivers/i2c/busses/i2c-mv64xxx.c linux-3.6.7-fbx/drivers/i2c/busses/i2c-mv64xxx.c --- linux-3.6.7/drivers/i2c/busses/i2c-mv64xxx.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/i2c/busses/i2c-mv64xxx.c 2014-04-17 16:28:06.840971257 +0200 @@ -23,6 +23,7 @@ #include #include #include +#include /* Register defines */ #define MV64XXX_I2C_REG_SLAVE_ADDR 0x00 @@ -170,7 +171,7 @@ if ((drv_data->bytes_left == 0) || (drv_data->aborting && (drv_data->byte_posn != 0))) { - if (drv_data->send_stop) { + if (drv_data->send_stop || drv_data->aborting) { drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP; drv_data->state = MV64XXX_I2C_STATE_IDLE; } else { @@ -225,6 +226,11 @@ case MV64XXX_I2C_STATUS_MAST_WR_NO_ACK: /* 30 */ case MV64XXX_I2C_STATUS_MAST_RD_ADDR_NO_ACK: /* 48 */ /* Doesn't seem to be a device at other end */ + dev_dbg(&drv_data->adapter.dev, + "mv64xxx_i2c_fsm: got no ack -- state: 0x%x, " + "status: 0x%x, addr: 0x%x, flags: 0x%x\n", + drv_data->state, status, drv_data->msg->addr, + drv_data->msg->flags); drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP; drv_data->state = MV64XXX_I2C_STATE_IDLE; drv_data->rc = -ENODEV; @@ -417,6 +423,34 @@ int is_first, int is_last) { unsigned long flags; + int limit; + + /* + * wait for (re)start/stop condition to clear from last + * transfer if any + */ + limit = 1000; + do { + u32 val; + + val = readl(drv_data->reg_base + MV64XXX_I2C_REG_CONTROL); + if (!(val & (MV64XXX_I2C_REG_CONTROL_START | + MV64XXX_I2C_REG_CONTROL_STOP))) + break; + + udelay(1); + } while (limit-- > 0); + + if (limit < 0) { + dev_err(&drv_data->adapter.dev, + "mv64xxx: start/stop bit won't clear\n"); + } + + /* according to datasheet, controller is buggy when you do + * register polling and it says to always wait for an IRQ + * (clock domain related), since we busywait for START/STOP + * clear, add a small delay */ + udelay(5); spin_lock_irqsave(&drv_data->lock, flags); mv64xxx_i2c_prepare_for_io(drv_data, msg); @@ -447,6 +481,7 @@ drv_data->send_stop = is_last; drv_data->block = 1; + mv64xxx_i2c_do_action(drv_data); spin_unlock_irqrestore(&drv_data->lock, flags); diff -ruw linux-3.6.7/drivers/i2c/busses/Kconfig linux-3.6.7-fbx/drivers/i2c/busses/Kconfig --- linux-3.6.7/drivers/i2c/busses/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/i2c/busses/Kconfig 2014-04-17 16:28:06.796970409 +0200 @@ -862,6 +862,10 @@ If you don't know what to do here, definitely say N. +config I2C_WP3 + tristate "Wintegra WP3 I2C controll" + depends on WINTEGRA_WINPATH3 + config SCx200_I2C tristate "NatSemi SCx200 I2C using GPIO pins (DEPRECATED)" depends on SCx200_GPIO diff -ruw linux-3.6.7/drivers/i2c/busses/Makefile linux-3.6.7-fbx/drivers/i2c/busses/Makefile --- linux-3.6.7/drivers/i2c/busses/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/i2c/busses/Makefile 2014-04-17 16:28:06.796970409 +0200 @@ -71,6 +71,7 @@ obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o obj-$(CONFIG_I2C_XILINX) += i2c-xiic.o obj-$(CONFIG_I2C_XLR) += i2c-xlr.o +obj-$(CONFIG_I2C_WP3) += i2c-wp3.o # External I2C/SMBus adapter drivers obj-$(CONFIG_I2C_DIOLAN_U2C) += i2c-diolan-u2c.o diff -ruw linux-3.6.7/drivers/ide/Kconfig linux-3.6.7-fbx/drivers/ide/Kconfig --- linux-3.6.7/drivers/ide/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/ide/Kconfig 2014-04-17 16:28:06.888972182 +0200 @@ -692,6 +692,11 @@ depends on BLK_DEV_IDE_AU1XXX endchoice +config BLK_DEV_IDE_TANGO2 + tristate "IDE for Tango2" + depends on TANGO2 + select BLK_DEV_IDEDMA_SFF + config BLK_DEV_IDE_TX4938 tristate "TX4938 internal IDE support" depends on SOC_TX4938 diff -ruw linux-3.6.7/drivers/ide/Makefile linux-3.6.7-fbx/drivers/ide/Makefile --- linux-3.6.7/drivers/ide/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/ide/Makefile 2013-09-03 14:19:32.582091198 +0200 @@ -116,3 +116,4 @@ obj-$(CONFIG_BLK_DEV_IDE_TX4938) += tx4938ide.o obj-$(CONFIG_BLK_DEV_IDE_TX4939) += tx4939ide.o +obj-$(CONFIG_BLK_DEV_IDE_TANGO2) += tango2ide.o diff -ruw linux-3.6.7/drivers/input/misc/Kconfig linux-3.6.7-fbx/drivers/input/misc/Kconfig --- linux-3.6.7/drivers/input/misc/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/input/misc/Kconfig 2014-04-17 16:28:09.149015720 +0200 @@ -600,4 +600,9 @@ To compile this driver as a module, choose M here: the module will be called xen-kbdfront. +config INPUT_SMSC_CAP1066 + tristate "SMSC CAP1066 capacitive sensor driver" + select I2C + select INPUT_POLLDEV + endif diff -ruw linux-3.6.7/drivers/input/misc/Makefile linux-3.6.7-fbx/drivers/input/misc/Makefile --- linux-3.6.7/drivers/input/misc/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/input/misc/Makefile 2014-04-17 16:28:09.149015720 +0200 @@ -56,3 +56,4 @@ obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o obj-$(CONFIG_INPUT_YEALINK) += yealink.o +obj-$(CONFIG_INPUT_SMSC_CAP1066) += smsc_cap1066.o diff -ruw linux-3.6.7/drivers/Kconfig linux-3.6.7-fbx/drivers/Kconfig --- linux-3.6.7/drivers/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/Kconfig 2014-04-17 16:28:05.056936889 +0200 @@ -4,8 +4,12 @@ source "drivers/connector/Kconfig" +source "drivers/fbxprocfs/Kconfig" + source "drivers/mtd/Kconfig" +source "drivers/fbxmtd/Kconfig" + source "drivers/of/Kconfig" source "drivers/parport/Kconfig" @@ -60,6 +64,10 @@ source "drivers/gpio/Kconfig" +source "drivers/fbxgpio/Kconfig" + +source "drivers/fbxjtag/Kconfig" + source "drivers/w1/Kconfig" source "drivers/power/Kconfig" @@ -68,6 +76,8 @@ source "drivers/thermal/Kconfig" +source "drivers/fbxwatchdog/Kconfig" + source "drivers/watchdog/Kconfig" source "drivers/ssb/Kconfig" @@ -96,6 +106,8 @@ source "drivers/leds/Kconfig" +source "drivers/fbxpanel/Kconfig" + source "drivers/accessibility/Kconfig" source "drivers/infiniband/Kconfig" diff -ruw linux-3.6.7/drivers/Makefile linux-3.6.7-fbx/drivers/Makefile --- linux-3.6.7/drivers/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/Makefile 2014-04-17 16:28:05.056936889 +0200 @@ -9,6 +9,8 @@ obj-y += pinctrl/ obj-y += gpio/ obj-y += pwm/ +obj-$(CONFIG_FREEBOX_GPIO) += fbxgpio/ +obj-$(CONFIG_FREEBOX_JTAG) += fbxjtag/ obj-$(CONFIG_PCI) += pci/ obj-$(CONFIG_PARISC) += parisc/ obj-$(CONFIG_RAPIDIO) += rapidio/ @@ -63,6 +65,9 @@ obj-$(CONFIG_VFIO) += vfio/ obj-y += cdrom/ obj-y += auxdisplay/ + +obj-$(CONFIG_FREEBOX_PROCFS) += fbxprocfs/ +obj-$(CONFIG_FREEBOX_MTD) += fbxmtd/ obj-$(CONFIG_PCCARD) += pcmcia/ obj-$(CONFIG_DIO) += dio/ obj-$(CONFIG_SBUS) += sbus/ @@ -88,6 +93,7 @@ obj-$(CONFIG_POWER_SUPPLY) += power/ obj-$(CONFIG_HWMON) += hwmon/ obj-$(CONFIG_THERMAL) += thermal/ +obj-$(CONFIG_FREEBOX_WATCHDOG) += fbxwatchdog/ obj-$(CONFIG_WATCHDOG) += watchdog/ obj-$(CONFIG_MD) += md/ obj-$(CONFIG_BT) += bluetooth/ @@ -101,6 +107,7 @@ obj-y += mmc/ obj-$(CONFIG_MEMSTICK) += memstick/ obj-y += leds/ +obj-$(CONFIG_FREEBOX_PANEL) += fbxpanel/ obj-$(CONFIG_INFINIBAND) += infiniband/ obj-$(CONFIG_SGI_SN) += sn/ obj-y += firmware/ diff -ruw linux-3.6.7/drivers/media/dvb/dvb-core/dvb_frontend.c linux-3.6.7-fbx/drivers/media/dvb/dvb-core/dvb_frontend.c --- linux-3.6.7/drivers/media/dvb/dvb-core/dvb_frontend.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/media/dvb/dvb-core/dvb_frontend.c 2014-04-17 16:28:09.685026045 +0200 @@ -754,6 +754,7 @@ fepriv->exit = DVB_FE_NORMAL_EXIT; mb(); + wake_up_all(&fepriv->events.wait_queue); if (!fepriv->thread) return; @@ -2308,6 +2309,9 @@ poll_wait (file, &fepriv->events.wait_queue, wait); + if (fepriv->exit) + return POLLERR | POLLHUP; + if (fepriv->events.eventw != fepriv->events.eventr) return (POLLIN | POLLRDNORM | POLLPRI); diff -ruw linux-3.6.7/drivers/media/dvb/dvb-usb/dib0700_devices.c linux-3.6.7-fbx/drivers/media/dvb/dvb-usb/dib0700_devices.c --- linux-3.6.7/drivers/media/dvb/dvb-usb/dib0700_devices.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/media/dvb/dvb-usb/dib0700_devices.c 2014-04-17 16:28:09.729026893 +0200 @@ -3570,6 +3570,7 @@ { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_TFE7790E) }, /* 80 */{ USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_TFE8096P) }, { USB_DEVICE(USB_VID_ELGATO, USB_PID_ELGATO_EYETV_DTT_2) }, + { USB_DEVICE(USB_VID_DIBCOM, USB_PID_DIBCOM_HOOK_DEFAULT_STK7770P) }, { 0 } /* Terminating entry */ }; MODULE_DEVICE_TABLE(usb, dib0700_usb_id_table); @@ -4301,6 +4302,35 @@ .change_protocol = dib0700_change_protocol, }, }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, + + .num_adapters = 1, + .adapter = { + { + .num_frontends = 1, + .fe = {{ + .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, + .pid_filter_count = 32, + .pid_filter = stk70x0p_pid_filter, + .pid_filter_ctrl = stk70x0p_pid_filter_ctrl, + .frontend_attach = stk7770p_frontend_attach, + .tuner_attach = dib7770p_tuner_attach, + + DIB0700_DEFAULT_STREAMING_CONFIG(0x02), + }}, + .size_of_priv = + sizeof(struct dib0700_adapter_state), + }, + }, + + .num_device_descs = 1, + .devices = { + { "DiBcom STK7770P reference design no IR", + { &dib0700_usb_id_table[82], NULL }, + { NULL }, + }, + }, + + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, .num_adapters = 1, .adapter = { { diff -ruw linux-3.6.7/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c linux-3.6.7-fbx/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c --- linux-3.6.7/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c 2014-04-17 16:28:09.741027124 +0200 @@ -250,6 +250,10 @@ adap->fe_adap[i].fe_sleep = adap->fe_adap[i].fe->ops.sleep; adap->fe_adap[i].fe->ops.sleep = dvb_usb_fe_sleep; + /* only attach the tuner if the demod is there */ + if (adap->props.fe[i].tuner_attach != NULL) + adap->props.fe[i].tuner_attach(adap); + if (dvb_register_frontend(&adap->dvb_adap, adap->fe_adap[i].fe)) { err("Frontend %d registration failed.", i); dvb_frontend_detach(adap->fe_adap[i].fe); @@ -262,10 +266,6 @@ return 0; } - /* only attach the tuner if the demod is there */ - if (adap->props.fe[i].tuner_attach != NULL) - adap->props.fe[i].tuner_attach(adap); - adap->num_frontends_initialized++; } diff -ruw linux-3.6.7/drivers/media/dvb/dvb-usb/dvb-usb.h linux-3.6.7-fbx/drivers/media/dvb/dvb-usb/dvb-usb.h --- linux-3.6.7/drivers/media/dvb/dvb-usb/dvb-usb.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/media/dvb/dvb-usb/dvb-usb.h 2014-04-17 16:28:09.741027124 +0200 @@ -296,7 +296,7 @@ int generic_bulk_ctrl_endpoint_response; int num_device_descs; - struct dvb_usb_device_description devices[12]; + struct dvb_usb_device_description devices[32]; }; /** diff -ruw linux-3.6.7/drivers/media/dvb/dvb-usb/dvb-usb-ids.h linux-3.6.7-fbx/drivers/media/dvb/dvb-usb/dvb-usb-ids.h --- linux-3.6.7/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/media/dvb/dvb-usb/dvb-usb-ids.h 2014-04-17 16:28:09.741027124 +0200 @@ -103,6 +103,7 @@ #define USB_PID_DELOCK_USB2_DVBT 0xb803 #define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064 #define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM 0x0065 +#define USB_PID_DIBCOM_HOOK_DEFAULT_STK7770P 0x0066 #define USB_PID_DIBCOM_MOD3000_COLD 0x0bb8 #define USB_PID_DIBCOM_MOD3000_WARM 0x0bb9 #define USB_PID_DIBCOM_MOD3001_COLD 0x0bc6 diff -ruw linux-3.6.7/drivers/media/dvb/Kconfig linux-3.6.7-fbx/drivers/media/dvb/Kconfig --- linux-3.6.7/drivers/media/dvb/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/media/dvb/Kconfig 2014-04-17 16:28:09.629024966 +0200 @@ -64,6 +64,10 @@ depends on DVB_CORE && PCI && I2C source "drivers/media/dvb/dm1105/Kconfig" +comment "Supported Tango2 Adapters" + depends on DVB_CORE && ARCH_FBX5_B +source "drivers/media/dvb/tango2/Kconfig" + comment "Supported FireWire (IEEE 1394) Adapters" depends on DVB_CORE && FIREWIRE source "drivers/media/dvb/firewire/Kconfig" diff -ruw linux-3.6.7/drivers/media/dvb/Makefile linux-3.6.7-fbx/drivers/media/dvb/Makefile --- linux-3.6.7/drivers/media/dvb/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/media/dvb/Makefile 2014-04-17 16:28:09.629024966 +0200 @@ -16,6 +16,7 @@ pt1/ \ mantis/ \ ngene/ \ - ddbridge/ + ddbridge/ \ + tango2/ obj-$(CONFIG_DVB_FIREDTV) += firewire/ diff -ruw linux-3.6.7/drivers/media/rc/keymaps/Makefile linux-3.6.7-fbx/drivers/media/rc/keymaps/Makefile --- linux-3.6.7/drivers/media/rc/keymaps/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/media/rc/keymaps/Makefile 2014-04-17 16:28:10.001032133 +0200 @@ -77,6 +77,7 @@ rc-pv951.o \ rc-hauppauge.o \ rc-rc6-mce.o \ + rc-rc6-freebox.o \ rc-real-audio-220-32-keys.o \ rc-snapstream-firefly.o \ rc-streamzap.o \ diff -ruw linux-3.6.7/drivers/misc/eeprom/at24.c linux-3.6.7-fbx/drivers/misc/eeprom/at24.c --- linux-3.6.7/drivers/misc/eeprom/at24.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/misc/eeprom/at24.c 2014-04-17 16:28:11.041052168 +0200 @@ -259,8 +259,9 @@ if (status == count) return count; - /* REVISIT: at HZ=100, this is sloooow */ - msleep(1); + if (need_resched()) + schedule(); + } while (time_before(read_time, timeout)); return -ETIMEDOUT; @@ -381,8 +382,9 @@ if (status == count) return count; - /* REVISIT: at HZ=100, this is sloooow */ - msleep(1); + if (need_resched()) + schedule(); + } while (time_before(write_time, timeout)); return -ETIMEDOUT; diff -ruw linux-3.6.7/drivers/misc/Kconfig linux-3.6.7-fbx/drivers/misc/Kconfig --- linux-3.6.7/drivers/misc/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/misc/Kconfig 2014-04-17 16:28:11.017051706 +0200 @@ -4,6 +4,9 @@ menu "Misc devices" +config WINTEGRA_MMAP + bool "wintegra mmap driver" + config SENSORS_LIS3LV02D tristate depends on INPUT @@ -442,6 +445,18 @@ To compile this driver as a module, choose M here: the module will be called vmw_balloon. +config INTELCE_PIC16PMU + tristate "PIC16 PMU, LED, hwmon support" + select INPUT_POLLDEV + select NEW_LEDS + select I2C + select HWMON + select ARCH_REQUIRE_GPIOLIB + ---help--- + Freebox v6 HD PIC16 PMU interface support, enables + control of the on-board LEDs and reports the power status, + reset status and button status. + config ARM_CHARLCD bool "ARM Ltd. Character LCD Driver" depends on PLAT_VERSATILE @@ -517,4 +532,7 @@ source "drivers/misc/carma/Kconfig" source "drivers/misc/altera-stapl/Kconfig" source "drivers/misc/mei/Kconfig" +source "drivers/misc/remoti/Kconfig" +source "drivers/misc/hdmi-cec/Kconfig" + endmenu diff -ruw linux-3.6.7/drivers/misc/Makefile linux-3.6.7-fbx/drivers/misc/Makefile --- linux-3.6.7/drivers/misc/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/misc/Makefile 2014-04-17 16:28:11.017051706 +0200 @@ -2,6 +2,7 @@ # Makefile for misc devices that really don't fit anywhere else. # +obj-$(CONFIG_WINTEGRA_MMAP) += wintegra_mmap.o obj-$(CONFIG_IBM_ASM) += ibmasm/ obj-$(CONFIG_AD525X_DPOT) += ad525x_dpot.o obj-$(CONFIG_AD525X_DPOT_I2C) += ad525x_dpot-i2c.o @@ -25,6 +26,7 @@ obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o obj-$(CONFIG_KGDB_TESTS) += kgdbts.o obj-$(CONFIG_SGI_XP) += sgi-xp/ +obj-$(CONFIG_INTELCE_PIC16PMU) += pic16-pmu.o obj-$(CONFIG_SGI_GRU) += sgi-gru/ obj-$(CONFIG_CS5535_MFGPT) += cs5535-mfgpt.o obj-$(CONFIG_HP_ILO) += hpilo.o @@ -50,3 +52,5 @@ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ obj-$(CONFIG_INTEL_MEI) += mei/ +obj-y += remoti/ +obj-y += hdmi-cec/ diff -ruw linux-3.6.7/drivers/mtd/devices/m25p80.c linux-3.6.7-fbx/drivers/mtd/devices/m25p80.c --- linux-3.6.7/drivers/mtd/devices/m25p80.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/mtd/devices/m25p80.c 2014-04-17 16:28:11.197055173 +0200 @@ -44,8 +44,10 @@ #define OPCODE_PP 0x02 /* Page program (up to 256 bytes) */ #define OPCODE_BE_4K 0x20 /* Erase 4KiB block */ #define OPCODE_BE_32K 0x52 /* Erase 32KiB block */ +#define OPCODE_EWRSR 0x50 /* Enable write to status regs */ #define OPCODE_CHIP_ERASE 0xc7 /* Erase whole flash chip */ #define OPCODE_SE 0xd8 /* Sector erase (usually 64KiB) */ +#define OPCODE_RDID_ALT 0x90 /* Read ID (alt) */ #define OPCODE_RDID 0x9f /* Read JEDEC ID */ /* Used for SST flashes only. */ @@ -594,6 +596,8 @@ u16 flags; #define SECT_4K 0x01 /* OPCODE_BE_4K works uniformly */ #define M25P_NO_ERASE 0x02 /* No erase command needed */ +#define ALT_PROBE 0x04 /* use alternate probe method */ +#define ALT_PROBE_ATMEL 0x08 /* use atmel probe method */ }; #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags) \ @@ -632,6 +636,8 @@ { "at26df081a", INFO(0x1f4501, 0, 64 * 1024, 16, SECT_4K) }, { "at26df161a", INFO(0x1f4601, 0, 64 * 1024, 32, SECT_4K) }, { "at26df321", INFO(0x1f4700, 0, 64 * 1024, 64, SECT_4K) }, + { "at25f512b", INFO(0x1f6500, 0x1f65, 32 * 1024, 2, + ALT_PROBE_ATMEL) }, /* EON -- en25xxx */ { "en25f32", INFO(0x1c3116, 0, 64 * 1024, 64, SECT_4K) }, @@ -658,6 +664,8 @@ { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) }, { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, + { "mx25l512", INFO(0xc20500, 0xc205, 64 * 1024, 1, + ALT_PROBE | SECT_4K) }, /* Spansion -- single (large) sector size only, at least * for the chips listed here (without boot sectors). @@ -680,6 +688,7 @@ { "s25fl064k", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) }, /* SST -- large erase sizes are "overlays", "sectors" are 4K */ + { "sst25vf512a", INFO(0xbf4800, 0xbf48, 32 * 1024, 2, ALT_PROBE) }, { "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024, 8, SECT_4K) }, { "sst25vf080b", INFO(0xbf258e, 0, 64 * 1024, 16, SECT_4K) }, { "sst25vf016b", INFO(0xbf2541, 0, 64 * 1024, 32, SECT_4K) }, @@ -740,6 +749,11 @@ { "cat25c09", CAT25_INFO( 128, 8, 32, 2) }, { "cat25c17", CAT25_INFO( 256, 8, 32, 2) }, { "cat25128", CAT25_INFO(2048, 8, 64, 2) }, + + /* EON */ + { "en25f05", INFO(0x1c0500, 0x1c05, 64 * 1024, 1, + ALT_PROBE | SECT_4K) }, + { }, }; MODULE_DEVICE_TABLE(spi, m25p_ids); @@ -783,6 +797,60 @@ return ERR_PTR(-ENODEV); } +static const struct spi_device_id *__devinit alt_probe(struct spi_device *spi) +{ + int tmp; + u8 read_id[4] = { OPCODE_RDID_ALT, 0, 0, 0 }; + u8 data[2]; + u16 id; + struct flash_info *info; + + read_id[3] = 0x0; + tmp = spi_write_then_read(spi, read_id, 4, data, 2); + if (tmp < 0) { + pr_debug("%s: error %d reading ALT ID\n", + dev_name(&spi->dev), tmp); + return ERR_PTR(tmp); + } + + id = (data[1] << 8) | data[0]; + + for (tmp = 0; tmp < ARRAY_SIZE(m25p_ids) - 1; tmp++) { + info = (void *)m25p_ids[tmp].driver_data; + if ((info->flags & ALT_PROBE) && (info->ext_id == id)) + return &m25p_ids[tmp]; + } + + dev_err(&spi->dev, "unrecognized ALT id %04x\n", id); + return ERR_PTR(-ENODEV); +} + +static const struct spi_device_id *__devinit atmel_probe(struct spi_device *spi) +{ + int tmp; + u8 opcode = 0x15; + u8 data[2]; + u16 id; + struct flash_info *info; + + tmp = spi_write_then_read(spi, &opcode, 1, data, 2); + if (tmp < 0) { + pr_debug("%s: error %d reading ATMEL ID\n", + dev_name(&spi->dev), tmp); + return ERR_PTR(tmp); + } + + id = (data[1] << 8) | data[0]; + + for (tmp = 0; tmp < ARRAY_SIZE(m25p_ids) - 1; tmp++) { + info = (void *)m25p_ids[tmp].driver_data; + if ((info->flags & ALT_PROBE_ATMEL) && (info->ext_id == id)) + return &m25p_ids[tmp]; + } + + dev_err(&spi->dev, "unrecognized ATMEL id %04x\n", id); + return ERR_PTR(-ENODEV); +} /* * board specific setup should have ensured the SPI clock used here @@ -791,7 +859,7 @@ */ static int __devinit m25p_probe(struct spi_device *spi) { - const struct spi_device_id *id = spi_get_device_id(spi); + const struct spi_device_id *id, *jid; struct flash_platform_data *data; struct m25p *flash; struct flash_info *info; @@ -809,6 +877,7 @@ * newer chips, even if we don't recognize the particular chip. */ data = spi->dev.platform_data; + id = NULL; if (data && data->type) { const struct spi_device_id *plat_id; @@ -825,15 +894,18 @@ dev_warn(&spi->dev, "unrecognized id %s\n", data->type); } - info = (void *)id->driver_data; - - if (info->jedec_id) { - const struct spi_device_id *jid; - + jid = alt_probe(spi); + if (IS_ERR(jid)) + jid = atmel_probe(spi); + if (IS_ERR(jid)) jid = jedec_probe(spi); + if (IS_ERR(jid)) { - return PTR_ERR(jid); - } else if (jid != id) { + dev_err(&spi->dev, "can't probe flash\n"); + return -ENODEV; + } + + if (id && jid != id) { /* * JEDEC knows better, so overwrite platform ID. We * can't trust partitions any longer, but we'll let @@ -843,10 +915,10 @@ */ dev_warn(&spi->dev, "found %s, expected %s\n", jid->name, id->name); + } + id = jid; info = (void *)jid->driver_data; - } - } flash = kzalloc(sizeof *flash, GFP_KERNEL); if (!flash) @@ -873,6 +945,14 @@ write_sr(flash, 0); } + if (info->ext_id == 0xbf48) { + u8 ewrsr = OPCODE_EWRSR; + + write_enable(flash); + spi_write_then_read(flash->spi, &ewrsr, 1, NULL, 0); + write_sr(flash, 0); + } + if (data && data->name) flash->mtd.name = data->name; else diff -ruw linux-3.6.7/drivers/mtd/Kconfig linux-3.6.7-fbx/drivers/mtd/Kconfig --- linux-3.6.7/drivers/mtd/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/mtd/Kconfig 2014-04-17 16:28:11.193055096 +0200 @@ -23,6 +23,9 @@ WARNING: some of the tests will ERASE entire MTD device which they test. Do not use these tests unless you really know what you do. +config MTD_ERASE_PRINTK + bool "write to kernel log when a block is erased" + config MTD_REDBOOT_PARTS tristate "RedBoot partition table parsing" ---help--- @@ -148,6 +151,17 @@ This provides partions parsing for BCM63xx devices with CFE bootloaders. +config MTD_FBX6HD_PARTS + tristate "Freebox V6 HD partitioning support" + help + Freebox V6 HD partitioning support + +config MTD_FBX6HD_PARTS_WRITE_ALL + bool "make all partitions writeable" + depends on MTD_FBX6HD_PARTS + help + Freebox V6 HD partitions support + comment "User Modules And Translation Layers" config MTD_CHAR diff -ruw linux-3.6.7/drivers/mtd/Makefile linux-3.6.7-fbx/drivers/mtd/Makefile --- linux-3.6.7/drivers/mtd/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/mtd/Makefile 2014-04-17 16:28:11.193055096 +0200 @@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o +obj-$(CONFIG_MTD_FBX6HD_PARTS) += fbx6hd-mtdparts.o # 'Users' - code which presents functionality to userspace. obj-$(CONFIG_MTD_CHAR) += mtdchar.o diff -ruw linux-3.6.7/drivers/mtd/mtdchar.c linux-3.6.7-fbx/drivers/mtd/mtdchar.c --- linux-3.6.7/drivers/mtd/mtdchar.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/mtd/mtdchar.c 2014-04-17 16:28:11.209055404 +0200 @@ -231,6 +231,7 @@ { struct mtd_oob_ops ops; + memset(&ops, 0, sizeof (ops)); ops.mode = MTD_OPS_RAW; ops.datbuf = kbuf; ops.oobbuf = NULL; @@ -325,6 +326,7 @@ { struct mtd_oob_ops ops; + memset(&ops, 0, sizeof (ops)); ops.mode = MTD_OPS_RAW; ops.datbuf = kbuf; ops.oobbuf = NULL; @@ -725,6 +727,10 @@ erase->callback = mtdchar_erase_callback; erase->priv = (unsigned long)&waitq; +#ifdef CONFIG_MTD_ERASE_PRINTK + printk(KERN_DEBUG "mtd: %s: ERASE offset=@%08llx\n", + mtd->name, erase->addr); +#endif /* FIXME: Allow INTERRUPTIBLE. Which means not having the wait_queue head on the stack. diff -ruw linux-3.6.7/drivers/mtd/mtdcore.c linux-3.6.7-fbx/drivers/mtd/mtdcore.c --- linux-3.6.7/drivers/mtd/mtdcore.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/mtd/mtdcore.c 2014-04-17 16:28:11.209055404 +0200 @@ -287,6 +287,33 @@ mtd_bitflip_threshold_show, mtd_bitflip_threshold_store); +static ssize_t mtd_nand_type_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct mtd_info *mtd = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%s\n", mtd->nand_type); +} +static DEVICE_ATTR(nand_type, S_IRUGO, mtd_nand_type_show, NULL); + +static ssize_t mtd_nand_manufacturer_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct mtd_info *mtd = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%s\n", mtd->nand_manufacturer); +} +static DEVICE_ATTR(nand_manufacturer, S_IRUGO, mtd_nand_manufacturer_show, NULL); + +static ssize_t mtd_nand_onfi_version_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct mtd_info *mtd = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%s\n", mtd->onfi_version); +} +static DEVICE_ATTR(onfi_version, S_IRUGO, mtd_nand_onfi_version_show, NULL); + static struct attribute *mtd_attrs[] = { &dev_attr_type.attr, &dev_attr_flags.attr, @@ -299,6 +326,9 @@ &dev_attr_name.attr, &dev_attr_ecc_strength.attr, &dev_attr_bitflip_threshold.attr, + &dev_attr_nand_type.attr, + &dev_attr_nand_manufacturer.attr, + &dev_attr_onfi_version.attr, NULL, }; diff -ruw linux-3.6.7/drivers/mtd/mtdpart.c linux-3.6.7-fbx/drivers/mtd/mtdpart.c --- linux-3.6.7/drivers/mtd/mtdpart.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/mtd/mtdpart.c 2014-04-17 16:28:11.209055404 +0200 @@ -366,6 +366,9 @@ slave->mtd.oobsize = master->oobsize; slave->mtd.oobavail = master->oobavail; slave->mtd.subpage_sft = master->subpage_sft; + slave->mtd.nand_type = master->nand_type; + slave->mtd.nand_manufacturer = master->nand_manufacturer; + slave->mtd.onfi_version = master->onfi_version; slave->mtd.name = name; slave->mtd.owner = master->owner; diff -ruw linux-3.6.7/drivers/mtd/nand/Kconfig linux-3.6.7-fbx/drivers/mtd/nand/Kconfig --- linux-3.6.7/drivers/mtd/nand/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/mtd/nand/Kconfig 2014-04-17 16:28:11.209055404 +0200 @@ -58,6 +58,15 @@ NAND chips (page size 256 byte, erase size 4-8KiB). The IDs of these chips were reused by later, larger chips. +config MTD_FORCE_BAD_BLOCK_ERASE + bool "Force erase on bad blocks (useful for bootloader parts)" + depends on MTD_NAND + default n + help + Enable this option only when you need to force an erase on + blocks being marked as "bad" by Linux (i.e: other ECC/bad block + marker layout). + config MTD_NAND_AUTCPU12 tristate "SmartMediaCard on autronix autcpu12 board" depends on ARCH_AUTCPU12 @@ -607,4 +616,9 @@ Enables support for NAND Flash chips on the ST Microelectronics Flexible Static Memory Controller (FSMC) +config MTD_NAND_DENALI_FBX + tristate "NAND Denali controller support" + depends on MTD_NAND && PCI + default n + endif # MTD_NAND diff -ruw linux-3.6.7/drivers/mtd/nand/Makefile linux-3.6.7-fbx/drivers/mtd/nand/Makefile --- linux-3.6.7/drivers/mtd/nand/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/mtd/nand/Makefile 2014-04-17 16:28:11.209055404 +0200 @@ -51,5 +51,6 @@ obj-$(CONFIG_MTD_NAND_RICOH) += r852.o obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o obj-$(CONFIG_MTD_NAND_GPMI_NAND) += gpmi-nand/ +obj-$(CONFIG_MTD_NAND_DENALI_FBX) += denali_nand.o nand-objs := nand_base.o nand_bbt.o diff -ruw linux-3.6.7/drivers/mtd/nand/nand_base.c linux-3.6.7-fbx/drivers/mtd/nand/nand_base.c --- linux-3.6.7/drivers/mtd/nand/nand_base.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/mtd/nand/nand_base.c 2014-04-17 16:28:11.249056175 +0200 @@ -2604,6 +2604,7 @@ while (len) { /* Check if we have a bad block, we do not erase bad blocks! */ +#ifndef CONFIG_MTD_FORCE_BAD_BLOCK_ERASE if (nand_block_checkbad(mtd, ((loff_t) page) << chip->page_shift, 0, allowbbt)) { pr_warn("%s: attempt to erase a bad block at page 0x%08x\n", @@ -2611,6 +2612,7 @@ instr->state = MTD_ERASE_FAILED; goto erase_exit; } +#endif /* * Invalidate the page cache, if we erase the block which @@ -2932,6 +2934,7 @@ int i, maf_idx; u8 id_data[8]; int ret; + char onfi_version[5]; /* Select the device */ chip->select_chip(mtd, 0); @@ -3169,7 +3172,38 @@ chip->onfi_version ? chip->onfi_params.model : type->name, mtd->writesize, mtd->oobsize); + mtd->nand_type = kstrdup(type->name, GFP_KERNEL); + if (!mtd->nand_type) + return ERR_PTR(-ENOMEM); + + mtd->nand_manufacturer = kstrdup(nand_manuf_ids[maf_idx].name, + GFP_KERNEL); + if (!mtd->nand_manufacturer) { + ret = -ENOMEM; + goto out_nand_type; + } + + snprintf(onfi_version, sizeof(onfi_version), "0"); + + if (chip->onfi_version) + snprintf(onfi_version, sizeof(onfi_version), "%d.%d", + chip->onfi_version / 10, + chip->onfi_version % 10); + + mtd->onfi_version = kstrdup(onfi_version, GFP_KERNEL); + if (!mtd->onfi_version) { + ret = -ENOMEM; + goto out_nand_manufacturer; + } + return type; + +out_nand_manufacturer: + kfree(mtd->nand_manufacturer); +out_nand_type: + kfree(mtd->nand_type); + + return ERR_PTR(ret); } /** @@ -3189,6 +3223,7 @@ int i, busw, nand_maf_id, nand_dev_id; struct nand_chip *chip = mtd->priv; struct nand_flash_dev *type; + int err; /* Get buswidth to select the correct functions */ busw = chip->options & NAND_BUSWIDTH_16; @@ -3203,7 +3238,8 @@ if (!(chip->options & NAND_SCAN_SILENT_NODEV)) pr_warn("No NAND device found\n"); chip->select_chip(mtd, -1); - return PTR_ERR(type); + err = PTR_ERR(type); + goto out_error; } /* Check for a chip array */ @@ -3226,6 +3262,16 @@ mtd->size = i * chip->chipsize; return 0; + +out_error: + if (mtd->nand_type) + kfree(mtd->nand_type); + if (mtd->nand_manufacturer) + kfree(mtd->nand_manufacturer); + if (mtd->onfi_version) + kfree(mtd->onfi_version); + + return err; } EXPORT_SYMBOL(nand_scan_ident); @@ -3357,9 +3403,13 @@ chip->ecc.read_page = nand_read_page_swecc; chip->ecc.read_subpage = nand_read_subpage; chip->ecc.write_page = nand_write_page_swecc; + if (!chip->ecc.read_page_raw) chip->ecc.read_page_raw = nand_read_page_raw; + if (!chip->ecc.write_page_raw) chip->ecc.write_page_raw = nand_write_page_raw; + if (!chip->ecc.read_oob) chip->ecc.read_oob = nand_read_oob_std; + if (!chip->ecc.write_oob) chip->ecc.write_oob = nand_write_oob_std; if (!chip->ecc.size) chip->ecc.size = 256; diff -ruw linux-3.6.7/drivers/mtd/nand/orion_nand.c linux-3.6.7-fbx/drivers/mtd/nand/orion_nand.c --- linux-3.6.7/drivers/mtd/nand/orion_nand.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/mtd/nand/orion_nand.c 2014-04-17 16:28:11.261056407 +0200 @@ -141,7 +141,11 @@ nc->IO_ADDR_R = nc->IO_ADDR_W = io_base; nc->cmd_ctrl = orion_nand_cmd_ctrl; nc->read_buf = orion_nand_read_buf; - nc->ecc.mode = NAND_ECC_SOFT; + nc->ecc.mode = board->ecc; + if (board->ecc == NAND_ECC_SOFT_BCH) { + nc->ecc.size = board->bch_ecc_size; + nc->ecc.bytes = board->bch_ecc_bytes; + } if (board->chip_delay) nc->chip_delay = board->chip_delay; diff -ruw linux-3.6.7/drivers/net/ethernet/Kconfig linux-3.6.7-fbx/drivers/net/ethernet/Kconfig --- linux-3.6.7/drivers/net/ethernet/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/ethernet/Kconfig 2014-04-17 16:28:11.441059874 +0200 @@ -161,6 +161,7 @@ will be called s6gmac. source "drivers/net/ethernet/seeq/Kconfig" +source "drivers/net/ethernet/sigma/Kconfig" source "drivers/net/ethernet/silan/Kconfig" source "drivers/net/ethernet/sis/Kconfig" source "drivers/net/ethernet/sfc/Kconfig" @@ -175,6 +176,7 @@ source "drivers/net/ethernet/tundra/Kconfig" source "drivers/net/ethernet/via/Kconfig" source "drivers/net/ethernet/wiznet/Kconfig" +source "drivers/net/ethernet/wintegra/Kconfig" source "drivers/net/ethernet/xilinx/Kconfig" source "drivers/net/ethernet/xircom/Kconfig" diff -ruw linux-3.6.7/drivers/net/ethernet/Makefile linux-3.6.7-fbx/drivers/net/ethernet/Makefile --- linux-3.6.7/drivers/net/ethernet/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/ethernet/Makefile 2014-04-17 16:28:11.445059951 +0200 @@ -61,6 +61,7 @@ obj-$(CONFIG_S6GMAC) += s6gmac.o obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/ obj-$(CONFIG_NET_VENDOR_SILAN) += silan/ +obj-$(CONFIG_NET_VENDOR_SIGMA) += sigma/ obj-$(CONFIG_NET_VENDOR_SIS) += sis/ obj-$(CONFIG_SFC) += sfc/ obj-$(CONFIG_NET_VENDOR_SGI) += sgi/ @@ -74,5 +75,6 @@ obj-$(CONFIG_NET_VENDOR_TUNDRA) += tundra/ obj-$(CONFIG_NET_VENDOR_VIA) += via/ obj-$(CONFIG_NET_VENDOR_WIZNET) += wiznet/ +obj-$(CONFIG_NET_VENDOR_WINTEGRA) += wintegra/ obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/ obj-$(CONFIG_NET_VENDOR_XIRCOM) += xircom/ diff -ruw linux-3.6.7/drivers/net/ethernet/marvell/Kconfig linux-3.6.7-fbx/drivers/net/ethernet/marvell/Kconfig --- linux-3.6.7/drivers/net/ethernet/marvell/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/ethernet/marvell/Kconfig 2014-04-17 16:28:12.109072742 +0200 @@ -23,6 +23,7 @@ depends on (MV64X60 || PPC32 || PLAT_ORION) && INET select INET_LRO select PHYLIB + select MII ---help--- This driver supports the gigabit ethernet MACs in the Marvell Discovery PPC/MIPS chipset family (MV643XX) and diff -ruw linux-3.6.7/drivers/net/ethernet/marvell/mv643xx_eth.c linux-3.6.7-fbx/drivers/net/ethernet/marvell/mv643xx_eth.c --- linux-3.6.7/drivers/net/ethernet/marvell/mv643xx_eth.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/ethernet/marvell/mv643xx_eth.c 2014-04-17 17:00:38.218938071 +0200 @@ -58,6 +58,8 @@ #include #include #include +#include +#include static char mv643xx_eth_driver_name[] = "mv643xx_eth"; static char mv643xx_eth_driver_version[] = "1.4"; @@ -109,6 +111,7 @@ #define DISABLE_AUTO_NEG_FOR_DUPLEX 0x00000004 #define FORCE_LINK_PASS 0x00000002 #define SERIAL_PORT_ENABLE 0x00000001 +#define PORT_VPT2P 0x0040 #define PORT_STATUS 0x0044 #define TX_FIFO_EMPTY 0x00000400 #define TX_IN_PROGRESS 0x00000080 @@ -228,6 +231,11 @@ /* RX & TX descriptor status */ #define ERROR_SUMMARY 0x00000001 +#define ERROR_CODE_RX_CRC (0x0 << 1) +#define ERROR_CODE_RX_OVERRUN (0x1 << 1) +#define ERROR_CODE_RX_MAX_LENGTH (0x2 << 1) +#define ERROR_CODE_RX_RESOURCE (0x3 << 1) +#define ERROR_CODE_MASK (0x3 << 1) /* RX descriptor status */ #define LAYER_4_CHECKSUM_OK 0x40000000 @@ -339,6 +347,8 @@ /* Non MIB hardware counters */ u32 rx_discard; u32 rx_overrun; + /* Non MIB software counters */ + u32 rx_packets_q[8]; }; struct lro_counters { @@ -355,6 +365,7 @@ int rx_desc_count; int rx_curr_desc; int rx_used_desc; + unsigned int rx_packets; struct rx_desc *rx_desc_area; dma_addr_t rx_desc_dma; @@ -558,7 +569,8 @@ return 0; } -static int rxq_process(struct rx_queue *rxq, int budget) +static int rxq_process(struct napi_struct *napi, struct rx_queue *rxq, + int budget) { struct mv643xx_eth_private *mp = rxq_to_mp(rxq); struct net_device_stats *stats = &mp->dev->stats; @@ -604,6 +616,7 @@ * start of the packet (which we don't count), and a 4 * byte CRC at the end of the packet (which we do count). */ + rxq->rx_packets++; stats->rx_packets++; stats->rx_bytes += byte_cnt - 2; @@ -631,7 +644,7 @@ lro_receive_skb(&rxq->lro_mgr, skb, (void *)cmd_sts); lro_flush_needed = 1; } else - netif_receive_skb(skb); + napi_gro_receive(napi, skb); continue; @@ -645,8 +658,22 @@ "received packet spanning multiple descriptors\n"); } - if (cmd_sts & ERROR_SUMMARY) + if (cmd_sts & ERROR_SUMMARY) { stats->rx_errors++; + if (cmd_sts & RX_FIRST_DESC) { + switch (cmd_sts & ERROR_CODE_MASK) { + case ERROR_CODE_RX_MAX_LENGTH: + stats->rx_length_errors++; + break; + case ERROR_CODE_RX_CRC: + stats->rx_crc_errors++; + break; + case ERROR_CODE_RX_OVERRUN: + stats->rx_fifo_errors++; + break; + } + } + } dev_kfree_skb(skb); } @@ -1123,9 +1150,10 @@ return 0; } -static int smi_bus_read(struct mii_bus *bus, int addr, int reg) +static int __smi_bus_read(struct mv643xx_eth_shared_private *msp, + int addr, int reg) { - struct mv643xx_eth_shared_private *msp = bus->priv; + void __iomem *smi_reg = msp->base + SMI_REG; int ret; @@ -1150,9 +1178,14 @@ return ret & 0xffff; } -static int smi_bus_write(struct mii_bus *bus, int addr, int reg, u16 val) +static int smi_bus_read(struct mii_bus *bus, int addr, int reg) +{ + return __smi_bus_read(bus->priv, addr, reg); +} + +static int __smi_bus_write(struct mv643xx_eth_shared_private *msp, + int addr, int reg, u16 val) { - struct mv643xx_eth_shared_private *msp = bus->priv; void __iomem *smi_reg = msp->base + SMI_REG; if (smi_wait_ready(msp)) { @@ -1171,6 +1204,10 @@ return 0; } +static int smi_bus_write(struct mii_bus *bus, int addr, int reg, u16 val) +{ + return __smi_bus_write(bus->priv, addr, reg, val); +} /* statistics ***************************************************************/ static struct net_device_stats *mv643xx_eth_get_stats(struct net_device *dev) @@ -1237,6 +1274,7 @@ static void mib_counters_update(struct mv643xx_eth_private *mp) { struct mib_counters *p = &mp->mib_counters; + unsigned int i; spin_lock_bh(&mp->mib_counters_lock); p->good_octets_received += mib_read(mp, 0x00); @@ -1272,6 +1310,10 @@ /* Non MIB hardware counters */ p->rx_discard += rdlp(mp, RX_DISCARD_FRAME_CNT); p->rx_overrun += rdlp(mp, RX_OVERRUN_FRAME_CNT); + /* Non MIB software counters */ + for (i = 0; i < ARRAY_SIZE(mp->rxq); i++) + p->rx_packets_q[i] = mp->rxq[i].rx_packets; + spin_unlock_bh(&mp->mib_counters_lock); mod_timer(&mp->mib_counters_timer, jiffies + 30 * HZ); @@ -1428,6 +1470,14 @@ LROSTAT(lro_aggregated), LROSTAT(lro_flushed), LROSTAT(lro_no_desc), + MIBSTAT(rx_packets_q[0]), + MIBSTAT(rx_packets_q[1]), + MIBSTAT(rx_packets_q[2]), + MIBSTAT(rx_packets_q[3]), + MIBSTAT(rx_packets_q[4]), + MIBSTAT(rx_packets_q[5]), + MIBSTAT(rx_packets_q[6]), + MIBSTAT(rx_packets_q[7]), }; static int @@ -1590,6 +1640,243 @@ return 0; } +static void +mv643xx_eth_get_channels(struct net_device *dev, struct ethtool_channels *c) +{ + struct mv643xx_eth_private *mp = netdev_priv(dev); + + c->max_rx = 8; + c->max_tx = 8; + c->max_other = 0; + c->max_combined = c->max_rx + c->max_tx; + c->rx_count = mp->rxq_count; + c->tx_count = mp->txq_count; +} + +static int +mv643xx_eth_set_channels(struct net_device *dev, struct ethtool_channels *c) +{ + struct mv643xx_eth_private *mp = netdev_priv(dev); + bool was_runnning; + + if (c->rx_count > 8 || c->max_tx > 8 || c->max_other) + return -EINVAL; + + was_runnning = netif_running(dev); + if (was_runnning) + mv643xx_eth_stop(dev); + + mp->rxq_count = c->rx_count; + mp->txq_count = c->tx_count; + + netif_set_real_num_rx_queues(dev, mp->rxq_count); + netif_set_real_num_tx_queues(dev, mp->txq_count); + + if (was_runnning && mv643xx_eth_open(dev)) { + netdev_err(dev, + "fatal error on re-opening device after channels change\n"); + return -ENOMEM; + } + + return 0; +} + +struct vprio_queue { + int prio; + int queue; +}; + +static int cmp_queue_inv(const void *a, const void *b) +{ + const struct vprio_queue *pa = a, *pb = b; + if (pb->queue != pa->queue) + return pb->queue - pa->queue; + return pa->prio - pb->prio; +} + +static void dump_vlan_rules(struct mv643xx_eth_private *mp, + struct vprio_queue *vprio_to_queue) +{ + unsigned int i; + u32 val; + + val = rdlp(mp, PORT_VPT2P); + for (i = 0; i < 8; i++) { + unsigned int queue; + + queue = (val & (0x7 << i * 3)) >> (i * 3); + vprio_to_queue[i].prio = i; + vprio_to_queue[i].queue = queue; + } + + /* sort with higher tx queue first */ + sort(vprio_to_queue, 8, sizeof (vprio_to_queue[0]), + cmp_queue_inv, NULL); +} + +static unsigned int find_vlan_rule(struct mv643xx_eth_private *mp, + unsigned int prio) +{ + struct vprio_queue vprio_to_queue[8]; + unsigned int i; + + /* check if we already have a rule for this vlan */ + dump_vlan_rules(mp, vprio_to_queue); + for (i = 0; i < ARRAY_SIZE(vprio_to_queue); i++) { + if (vprio_to_queue[i].prio != prio) + continue; + return i; + } + /* never reached */ + return 0; +} + +static int +mv643xx_eth_get_rxnfc(struct net_device *dev, + struct ethtool_rxnfc *info, u32 *rule_locs) +{ + struct mv643xx_eth_private *mp = netdev_priv(dev); + + switch (info->cmd) { + case ETHTOOL_GRXFH: + return -ENOTSUPP; + case ETHTOOL_GRXRINGS: + info->data = mp->rxq_count; + break; + + case ETHTOOL_GRXCLSRLCNT: + info->rule_cnt = 8; + info->data = RX_CLS_LOC_SPECIAL; + break; + + case ETHTOOL_GRXCLSRLALL: + { + unsigned int i; + + if (info->rule_cnt < 8) + return -EINVAL; + + info->data = 8; + info->rule_cnt = 8; + + for (i = 0; i < 8; i++) + rule_locs[i] = i; + + break; + } + + case ETHTOOL_GRXCLSRULE: + { + struct vprio_queue vprio_to_queue[8], *r; + struct ethtool_flow_ext *h_ext, *m_ext; + unsigned int loc; + + loc = info->fs.location; + if (loc >= ARRAY_SIZE(vprio_to_queue)) + return -EINVAL; + + dump_vlan_rules(mp, vprio_to_queue); + r = &vprio_to_queue[loc]; + + memset(&info->fs, 0, sizeof (info->fs)); + info->fs.flow_type = ETHER_FLOW | FLOW_EXT; + info->fs.ring_cookie = r->queue; + info->fs.location = loc; + + m_ext = &info->fs.m_ext; + m_ext->vlan_tci |= VLAN_PRIO_MASK; + + h_ext = &info->fs.h_ext; + h_ext->vlan_tci |= r->prio << VLAN_PRIO_SHIFT; + + break; + } + } + return 0; +} + +static int +mv643xx_eth_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info) +{ + struct mv643xx_eth_private *mp = netdev_priv(dev); + + switch (info->cmd) { + case ETHTOOL_SRXFH: + return -ENOTSUPP; + + case ETHTOOL_SRXCLSRLINS: + { + struct ethhdr *m, z; + struct ethtool_flow_ext *h_ext, *m_ext; + unsigned int prio; + unsigned int rule_nr; + u32 val; + + if ((info->fs.flow_type & (FLOW_MAC_EXT | FLOW_EXT)) != + FLOW_EXT) + return -EINVAL; + + info->fs.flow_type &= ~FLOW_EXT; + if (info->fs.flow_type != ETHER_FLOW) + return -EINVAL; + + if (info->fs.ring_cookie >= mp->rxq_count) + return -EINVAL; + + if (info->fs.location != RX_CLS_LOC_ANY) + return -EINVAL; + + /* no mask should be set on ethernet */ + m = &info->fs.m_u.ether_spec; + memset(&z, 0, sizeof (z)); + if (memcmp(m, &z, sizeof (*m))) + return -EINVAL; + + /* no mask should be set on ext besides vlan prio */ + m_ext = &info->fs.m_ext; + if (m_ext->vlan_etype || + m_ext->data[0] || + m_ext->data[1] || + ntohs(m_ext->vlan_tci) != VLAN_PRIO_MASK) + return -EINVAL; + + /* ok, extract vlan prio */ + h_ext = &info->fs.h_ext; + prio = (ntohs(h_ext->vlan_tci) & VLAN_PRIO_MASK) >> + VLAN_PRIO_SHIFT; + + /* update vlan priority table for new rule */ + rule_nr = find_vlan_rule(mp, prio); + + val = rdlp(mp, PORT_VPT2P); + val |= info->fs.ring_cookie << (prio * 3); + wrlp(mp, PORT_VPT2P, val); + + info->fs.location = rule_nr; + break; + } + + case ETHTOOL_SRXCLSRLDEL: + { + struct vprio_queue vprio_to_queue[8], *r; + u32 val; + + if (info->fs.location >= ARRAY_SIZE(vprio_to_queue)) + return -EINVAL; + + dump_vlan_rules(mp, vprio_to_queue); + r = &vprio_to_queue[info->fs.location]; + + /* update vlan priority table */ + val = rdlp(mp, PORT_VPT2P); + val &= ~(0x7 << (r->prio * 3)); + wrlp(mp, PORT_VPT2P, val); + break; + } + } + + return 0; +} static int mv643xx_eth_set_features(struct net_device *dev, netdev_features_t features) @@ -1665,6 +1952,10 @@ .get_ethtool_stats = mv643xx_eth_get_ethtool_stats, .get_sset_count = mv643xx_eth_get_sset_count, .get_ts_info = ethtool_op_get_ts_info, + .get_channels = mv643xx_eth_get_channels, + .set_channels = mv643xx_eth_set_channels, + .get_rxnfc = mv643xx_eth_get_rxnfc, + .set_rxnfc = mv643xx_eth_set_rxnfc, }; @@ -2175,7 +2466,7 @@ work_done += txq_reclaim(mp->txq + queue, work_tbd, 0); txq_maybe_wake(mp->txq + queue); } else if (mp->work_rx & queue_mask) { - work_done += rxq_process(mp->rxq + queue, work_tbd); + work_done += rxq_process(napi, mp->rxq + queue, work_tbd); } else if (!mp->oom && (mp->work_rx_refill & queue_mask)) { work_done += rxq_refill(mp->rxq + queue, work_tbd); } else { @@ -2441,12 +2732,43 @@ return 0; } +/* + * MII read callback from mii core + */ +static int smi_bus_read_mii(struct net_device *dev, int mii_id, + int regnum) +{ + struct mv643xx_eth_private *mp = netdev_priv(dev); + return __smi_bus_read(mp->shared, mii_id, regnum); +} + +/* + * MII write callback from mii core + */ +static void smi_bus_write_mii(struct net_device *dev, int mii_id, + int regnum, int value) +{ + struct mv643xx_eth_private *mp = netdev_priv(dev); + __smi_bus_write(mp->shared, mii_id, regnum, value); +} + static int mv643xx_eth_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) { struct mv643xx_eth_private *mp = netdev_priv(dev); if (mp->phy != NULL) return phy_mii_ioctl(mp->phy, ifr, cmd); + else { + struct mii_if_info mii; + + mii.dev = dev; + mii.mdio_read = smi_bus_read_mii; + mii.mdio_write = smi_bus_write_mii; + mii.phy_id = 0; + mii.phy_id_mask = 0x3f; + mii.reg_num_mask = 0x1f; + return generic_mii_ioctl(&mii, if_mii(ifr), cmd, NULL); + } return -EOPNOTSUPP; } @@ -2900,6 +3222,16 @@ if (pd->phy_addr != MV643XX_ETH_PHY_NONE) mp->phy = phy_scan(mp, pd->phy_addr); + else { + if (pd->mii_config && + pd->mii_config(dev, 1, + smi_bus_read_mii, + smi_bus_write_mii)) { + dev_err(&pdev->dev, "unable to configure mdio bus\n"); + err = -EIO; + goto out; + } + } if (mp->phy != NULL) phy_init(mp, pd->speed, pd->duplex); diff -ruw linux-3.6.7/drivers/net/ethernet/marvell/sky2.c linux-3.6.7-fbx/drivers/net/ethernet/marvell/sky2.c --- linux-3.6.7/drivers/net/ethernet/marvell/sky2.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/ethernet/marvell/sky2.c 2014-04-17 16:28:12.141073359 +0200 @@ -3047,6 +3047,16 @@ int work_done = 0; u16 idx; + if (status == 0xffffffff) { + /* + * this may happen if hardware is removed without + * being properly disabled. + */ + printk("sky2: serious hardware error.\n"); + napi_complete(napi); + return 0; + } + if (unlikely(status & Y2_IS_ERROR)) sky2_err_intr(hw, status); diff -ruw linux-3.6.7/drivers/net/Kconfig linux-3.6.7-fbx/drivers/net/Kconfig --- linux-3.6.7/drivers/net/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/Kconfig 2014-04-17 16:28:11.333057793 +0200 @@ -339,4 +339,18 @@ source "drivers/net/hyperv/Kconfig" +config TANGO2_ENET + tristate "SMP863x Builtin Ethernet support" + depends on NET_ETHERNET && TANGO2 + select MII + select CRC32 + help + This option adds support for the SMP863x integrated Ethernet + controller. This driver uses NAPI and generic Linux MII + support. + +config TANGO2_PCINET_H + tristate "SMP863x network over PCI support (smp863x side)" + depends on NET_ETHERNET && TANGO2 + endif # NETDEVICES diff -ruw linux-3.6.7/drivers/net/ppp/ppp_generic.c linux-3.6.7-fbx/drivers/net/ppp/ppp_generic.c --- linux-3.6.7/drivers/net/ppp/ppp_generic.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/ppp/ppp_generic.c 2014-04-17 16:28:12.557081373 +0200 @@ -162,6 +162,7 @@ struct ppp *ppp; /* ppp unit we're connected to */ struct net *chan_net; /* the net channel belongs to */ struct list_head clist; /* link in list of channels per unit */ + int stopped; /* channel is stopped */ rwlock_t upl; /* protects `ppp' */ #ifdef CONFIG_PPP_MULTILINK u8 avail; /* flag used in multilink stuff */ @@ -1060,11 +1061,29 @@ ppp_send_frame(ppp, skb); /* If there's no work left to do, tell the core net code that we can accept some more. */ - if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq)) + if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq)) { + /* only enable net queue if at least one + * channel is not stopped */ + struct list_head *list; + struct channel *pch; + bool need_wake; + + list = &ppp->channels; + need_wake = false; + while ((list = list->next) != &ppp->channels) { + pch = list_entry(list, struct channel, clist); + if (!pch->stopped) { + need_wake = true; + break; + } + } + + if (need_wake) netif_wake_queue(ppp->dev); else netif_stop_queue(ppp->dev); } + } ppp_xmit_unlock(ppp); } @@ -2292,10 +2311,24 @@ if (!pch) return; + pch->stopped = 0; ppp_channel_push(pch); } /* + * Callback from a channel when it want to prevent further transmit on it + */ +void +ppp_output_stop(struct ppp_channel *chan) +{ + struct channel *pch = chan->ppp; + + if (pch == 0) + return; + pch->stopped = 1; +} + +/* * Compression control. */ @@ -2976,6 +3009,7 @@ EXPORT_SYMBOL(ppp_input); EXPORT_SYMBOL(ppp_input_error); EXPORT_SYMBOL(ppp_output_wakeup); +EXPORT_SYMBOL(ppp_output_stop); EXPORT_SYMBOL(ppp_register_compressor); EXPORT_SYMBOL(ppp_unregister_compressor); MODULE_LICENSE("GPL"); diff -ruw linux-3.6.7/drivers/net/wireless/ath/ath9k/init.c linux-3.6.7-fbx/drivers/net/wireless/ath/ath9k/init.c --- linux-3.6.7/drivers/net/wireless/ath/ath9k/init.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/wireless/ath/ath9k/init.c 2014-04-17 16:28:12.749085072 +0200 @@ -46,6 +46,10 @@ module_param_named(btcoex_enable, ath9k_btcoex_enable, int, 0444); MODULE_PARM_DESC(btcoex_enable, "Enable wifi-BT coexistence"); +static char ath9k_base_mac_addr[18] = "00:00:00:00:00:00"; +module_param_string(base_mac_addr, ath9k_base_mac_addr, 18, 0); +MODULE_PARM_DESC(base_mac_addr, "Override EEPROM defined base mac address"); + bool is_ath9k_unloaded; /* We use the hw_value as an index into our private channel structure */ @@ -680,6 +684,7 @@ { struct ath_hw *ah = sc->sc_ah; struct ath_common *common = ath9k_hw_common(ah); + static u8 base_mac[ETH_ALEN]; hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | @@ -763,6 +768,10 @@ ath9k_reload_chainmask_settings(sc); + if (mac_pton(ath9k_base_mac_addr, base_mac) && + !is_zero_ether_addr(base_mac)) + SET_IEEE80211_PERM_ADDR(hw, base_mac); + else SET_IEEE80211_PERM_ADDR(hw, common->macaddr); } diff -ruw linux-3.6.7/drivers/net/wireless/Kconfig linux-3.6.7-fbx/drivers/net/wireless/Kconfig --- linux-3.6.7/drivers/net/wireless/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/wireless/Kconfig 2014-04-17 16:28:12.673083607 +0200 @@ -268,6 +268,13 @@ To compile this driver as a module, choose M here: the module will be called mwl8k. If unsure, say N. +config MWL8K_MFG + tristate "Marvell 88W8xxx Manufacturing mode" + # force build as module, only if mwl8k is built as module or + # unselected + depends on m && (MWL8K_MODULE || !MWL8K) + select CFG80211_WEXT + source "drivers/net/wireless/ath/Kconfig" source "drivers/net/wireless/b43/Kconfig" source "drivers/net/wireless/b43legacy/Kconfig" diff -ruw linux-3.6.7/drivers/net/wireless/Makefile linux-3.6.7-fbx/drivers/net/wireless/Makefile --- linux-3.6.7/drivers/net/wireless/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/wireless/Makefile 2014-04-17 16:28:12.673083607 +0200 @@ -40,6 +40,7 @@ obj-$(CONFIG_ADM8211) += adm8211.o obj-$(CONFIG_MWL8K) += mwl8k.o +obj-$(CONFIG_MWL8K_MFG) += mwl8k_mfg.o obj-$(CONFIG_IWLWIFI) += iwlwifi/ obj-$(CONFIG_IWLEGACY) += iwlegacy/ diff -ruw linux-3.6.7/drivers/net/wireless/mwl8k.c linux-3.6.7-fbx/drivers/net/wireless/mwl8k.c --- linux-3.6.7/drivers/net/wireless/mwl8k.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/wireless/mwl8k.c 2014-04-17 16:28:13.189093548 +0200 @@ -28,14 +28,25 @@ #define MWL8K_DESC "Marvell TOPDOG(R) 802.11 Wireless Network Driver" #define MWL8K_NAME KBUILD_MODNAME -#define MWL8K_VERSION "0.13" +#define MWL8K_VERSION "0.16.0" /* Module parameters */ -static bool ap_mode_default; +static bool ap_mode_default = 1; module_param(ap_mode_default, bool, 0); MODULE_PARM_DESC(ap_mode_default, "Set to 1 to make ap mode the default instead of sta mode"); +static bool disable_life_time_expiry; +module_param(disable_life_time_expiry, bool, 0); +MODULE_PARM_DESC(disable_life_time_expiry, + "Set to 1 to to disable the life time expiry feature"); + +static u8 ap_base_mac_addr[18] = "00:00:00:00:00:00"; +module_param_string(base_mac_addr, ap_base_mac_addr, 18, 0); +MODULE_PARM_DESC(ap_base_mac_addr, + "Override EEPROM defined base mac address in AP mode"); + + /* Register definitions */ #define MWL8K_HIU_GEN_PTR 0x00000c10 #define MWL8K_MODE_STA 0x0000005a @@ -100,6 +111,8 @@ #define MWL8K_MAX_AMPDU_QUEUES 8 #define MWL8K_MAX_TX_QUEUES (MWL8K_TX_WMM_QUEUES + MWL8K_MAX_AMPDU_QUEUES) #define mwl8k_tx_queues(priv) (MWL8K_TX_WMM_QUEUES + (priv)->num_ampdu_queues) +#define MWL8K_NUM_AMPDU_STREAMS 7 +#define TOTAL_HW_TX_QUEUES 8 struct rxd_ops { int rxd_size; @@ -160,7 +173,6 @@ u8 tid; u8 state; u8 idx; - u8 txq_idx; /* index of this stream in priv->txq */ }; struct mwl8k_priv { @@ -202,6 +214,8 @@ int fw_mutex_depth; struct completion *hostcmd_wait; + atomic_t watchdog_event_pending; + /* lock held over TX and TX reap */ spinlock_t tx_lock; @@ -265,12 +279,18 @@ /* To perform the task of reloading the firmware */ struct work_struct fw_reload; + /* To firmware if the firmware is stuck or has crashed */ + struct work_struct fw_check; bool hw_restart_in_progress; + /* Set to true after the firmware is loaded */ + bool booted; + /* async firmware loading state */ unsigned fw_state; char *fw_pref; char *fw_alt; + bool is_8764; struct completion firmware_loading_complete; }; @@ -584,13 +604,17 @@ loops = 1000; do { u32 int_code; - + if (priv->is_8764) { + int_code = ioread32(regs + MWL8K_HIU_H2A_INTERRUPT_STATUS); + if (int_code == 0) + break; + } else { int_code = ioread32(regs + MWL8K_HIU_INT_CODE); if (int_code == MWL8K_INT_CODE_CMD_FINISHED) { iowrite32(0, regs + MWL8K_HIU_INT_CODE); break; } - + } cond_resched(); udelay(1); } while (--loops); @@ -708,7 +732,7 @@ int rc; int loops; - if (!memcmp(fw->data, "\x01\x00\x00\x00", 4)) { + if (priv->fw_helper) { const struct firmware *helper = priv->fw_helper; if (helper == NULL) { @@ -727,6 +751,9 @@ rc = mwl8k_feed_fw_image(priv, fw->data, fw->size); } else { + if (priv->is_8764) + rc = mwl8k_feed_fw_image(priv, fw->data, fw->size); + else rc = mwl8k_load_fw_image(priv, fw->data, fw->size); } @@ -892,9 +919,9 @@ } /* - * Packet reception for 88w8366 AP firmware. + * Packet reception for 88w8366/88w8764 AP firmware. */ -struct mwl8k_rxd_8366_ap { +struct mwl8k_rxd_ap { __le16 pkt_len; __u8 sq2; __u8 rate; @@ -912,30 +939,30 @@ __u8 rx_ctrl; } __packed; -#define MWL8K_8366_AP_RATE_INFO_MCS_FORMAT 0x80 -#define MWL8K_8366_AP_RATE_INFO_40MHZ 0x40 -#define MWL8K_8366_AP_RATE_INFO_RATEID(x) ((x) & 0x3f) - -#define MWL8K_8366_AP_RX_CTRL_OWNED_BY_HOST 0x80 - -/* 8366 AP rx_status bits */ -#define MWL8K_8366_AP_RXSTAT_DECRYPT_ERR_MASK 0x80 -#define MWL8K_8366_AP_RXSTAT_GENERAL_DECRYPT_ERR 0xFF -#define MWL8K_8366_AP_RXSTAT_TKIP_DECRYPT_MIC_ERR 0x02 -#define MWL8K_8366_AP_RXSTAT_WEP_DECRYPT_ICV_ERR 0x04 -#define MWL8K_8366_AP_RXSTAT_TKIP_DECRYPT_ICV_ERR 0x08 +#define MWL8K_AP_RATE_INFO_MCS_FORMAT 0x80 +#define MWL8K_AP_RATE_INFO_40MHZ 0x40 +#define MWL8K_AP_RATE_INFO_RATEID(x) ((x) & 0x3f) + +#define MWL8K_AP_RX_CTRL_OWNED_BY_HOST 0x80 + +/* 8366/8764 AP rx_status bits */ +#define MWL8K_AP_RXSTAT_DECRYPT_ERR_MASK 0x80 +#define MWL8K_AP_RXSTAT_GENERAL_DECRYPT_ERR 0xFF +#define MWL8K_AP_RXSTAT_TKIP_DECRYPT_MIC_ERR 0x02 +#define MWL8K_AP_RXSTAT_WEP_DECRYPT_ICV_ERR 0x04 +#define MWL8K_AP_RXSTAT_TKIP_DECRYPT_ICV_ERR 0x08 -static void mwl8k_rxd_8366_ap_init(void *_rxd, dma_addr_t next_dma_addr) +static void mwl8k_rxd_ap_init(void *_rxd, dma_addr_t next_dma_addr) { - struct mwl8k_rxd_8366_ap *rxd = _rxd; + struct mwl8k_rxd_ap *rxd = _rxd; rxd->next_rxd_phys_addr = cpu_to_le32(next_dma_addr); - rxd->rx_ctrl = MWL8K_8366_AP_RX_CTRL_OWNED_BY_HOST; + rxd->rx_ctrl = MWL8K_AP_RX_CTRL_OWNED_BY_HOST; } -static void mwl8k_rxd_8366_ap_refill(void *_rxd, dma_addr_t addr, int len) +static void mwl8k_rxd_ap_refill(void *_rxd, dma_addr_t addr, int len) { - struct mwl8k_rxd_8366_ap *rxd = _rxd; + struct mwl8k_rxd_ap *rxd = _rxd; rxd->pkt_len = cpu_to_le16(len); rxd->pkt_phys_addr = cpu_to_le32(addr); @@ -944,12 +971,12 @@ } static int -mwl8k_rxd_8366_ap_process(void *_rxd, struct ieee80211_rx_status *status, +mwl8k_rxd_ap_process(void *_rxd, struct ieee80211_rx_status *status, __le16 *qos, s8 *noise) { - struct mwl8k_rxd_8366_ap *rxd = _rxd; + struct mwl8k_rxd_ap *rxd = _rxd; - if (!(rxd->rx_ctrl & MWL8K_8366_AP_RX_CTRL_OWNED_BY_HOST)) + if (!(rxd->rx_ctrl & MWL8K_AP_RX_CTRL_OWNED_BY_HOST)) return -1; rmb(); @@ -958,11 +985,11 @@ status->signal = -rxd->rssi; *noise = -rxd->noise_floor; - if (rxd->rate & MWL8K_8366_AP_RATE_INFO_MCS_FORMAT) { + if (rxd->rate & MWL8K_AP_RATE_INFO_MCS_FORMAT) { status->flag |= RX_FLAG_HT; - if (rxd->rate & MWL8K_8366_AP_RATE_INFO_40MHZ) + if (rxd->rate & MWL8K_AP_RATE_INFO_40MHZ) status->flag |= RX_FLAG_40MHZ; - status->rate_idx = MWL8K_8366_AP_RATE_INFO_RATEID(rxd->rate); + status->rate_idx = MWL8K_AP_RATE_INFO_RATEID(rxd->rate); } else { int i; @@ -986,19 +1013,19 @@ *qos = rxd->qos_control; - if ((rxd->rx_status != MWL8K_8366_AP_RXSTAT_GENERAL_DECRYPT_ERR) && - (rxd->rx_status & MWL8K_8366_AP_RXSTAT_DECRYPT_ERR_MASK) && - (rxd->rx_status & MWL8K_8366_AP_RXSTAT_TKIP_DECRYPT_MIC_ERR)) + if ((rxd->rx_status != MWL8K_AP_RXSTAT_GENERAL_DECRYPT_ERR) && + (rxd->rx_status & MWL8K_AP_RXSTAT_DECRYPT_ERR_MASK) && + (rxd->rx_status & MWL8K_AP_RXSTAT_TKIP_DECRYPT_MIC_ERR)) status->flag |= RX_FLAG_MMIC_ERROR; return le16_to_cpu(rxd->pkt_len); } -static struct rxd_ops rxd_8366_ap_ops = { - .rxd_size = sizeof(struct mwl8k_rxd_8366_ap), - .rxd_init = mwl8k_rxd_8366_ap_init, - .rxd_refill = mwl8k_rxd_8366_ap_refill, - .rxd_process = mwl8k_rxd_8366_ap_process, +static struct rxd_ops rxd_ap_ops = { + .rxd_size = sizeof(struct mwl8k_rxd_ap), + .rxd_init = mwl8k_rxd_ap_init, + .rxd_refill = mwl8k_rxd_ap_refill, + .rxd_process = mwl8k_rxd_ap_process, }; /* @@ -1490,20 +1517,77 @@ } } +#define MWL8K_TX_WAIT_TIMEOUT_MS 5000 + +static void mwl8k_check_fw_state(struct work_struct *work) +{ + DECLARE_COMPLETION_ONSTACK(tx_wait); + struct mwl8k_priv *priv = + container_of(work, struct mwl8k_priv, fw_check); + struct ieee80211_hw *hw = priv->hw; + int retry; + int rc; + + if (priv->hw_restart_in_progress) + return; + + might_sleep(); + + + retry = 1; + rc = 0; + + spin_lock_bh(&priv->tx_lock); + if (!priv->pending_tx_pkts) { + spin_unlock_bh(&priv->tx_lock); + return; + } + priv->tx_wait = &tx_wait; + while (!rc) { + unsigned long timeout; + + spin_unlock_bh(&priv->tx_lock); + timeout = wait_for_completion_timeout(&tx_wait, + msecs_to_jiffies(MWL8K_TX_WAIT_TIMEOUT_MS)); + + spin_lock_bh(&priv->tx_lock); + + if (timeout || !priv->pending_tx_pkts) + break; + + if (retry) { + mwl8k_tx_start(priv); + retry = 0; + continue; + } + + wiphy_err(hw->wiphy, "tx rings stuck for %d ms\n", + MWL8K_TX_WAIT_TIMEOUT_MS); + mwl8k_dump_tx_rings(hw); + + priv->tx_wait = NULL; + priv->hw_restart_in_progress = true; + ieee80211_queue_work(hw, &priv->fw_reload); + rc = -ETIMEDOUT; + } + + priv->tx_wait = NULL; + spin_unlock_bh(&priv->tx_lock); + + return; +} + /* * Must be called with priv->fw_mutex held and tx queues stopped. */ -#define MWL8K_TX_WAIT_TIMEOUT_MS 5000 static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw) { struct mwl8k_priv *priv = hw->priv; - DECLARE_COMPLETION_ONSTACK(tx_wait); + DECLARE_COMPLETION_ONSTACK(tx_wait_old); int retry; int rc; - might_sleep(); - /* Since fw restart is in progress, allow only the firmware * commands from the restart code and block the other * commands since they are going to fail in any case since @@ -1512,10 +1596,26 @@ if (priv->hw_restart_in_progress) { if (priv->hw_restart_owner == current) return 0; - else + else { return -EBUSY; } + } + + /* For 8764, cmd and data need not be multiplexed, however to + * detect a situation where the fw has crashed, schedule a work + * queue to check the firmware state and take the necessary action + */ + + if (priv->is_8764 && priv->booted == true) { + if (!priv->hw_restart_in_progress) + ieee80211_queue_work(hw, &priv->fw_check); + return 0; + } + might_sleep(); + + if (atomic_read(&priv->watchdog_event_pending)) + return 0; /* * The TX queues are stopped at this point, so this test * doesn't need to take ->tx_lock. @@ -1527,7 +1627,7 @@ rc = 0; spin_lock_bh(&priv->tx_lock); - priv->tx_wait = &tx_wait; + priv->tx_wait = &tx_wait_old; while (!rc) { int oldcount; unsigned long timeout; @@ -1535,8 +1635,16 @@ oldcount = priv->pending_tx_pkts; spin_unlock_bh(&priv->tx_lock); - timeout = wait_for_completion_timeout(&tx_wait, + timeout = wait_for_completion_timeout(&tx_wait_old, msecs_to_jiffies(MWL8K_TX_WAIT_TIMEOUT_MS)); + + if (atomic_read(&priv->watchdog_event_pending)) { + spin_lock_bh(&priv->tx_lock); + priv->tx_wait = NULL; + spin_unlock_bh(&priv->tx_lock); + return 0; + } + spin_lock_bh(&priv->tx_lock); if (timeout) { @@ -1564,6 +1672,7 @@ rc = -ETIMEDOUT; } + priv->tx_wait = NULL; spin_unlock_bh(&priv->tx_lock); return rc; @@ -1734,14 +1843,13 @@ struct mwl8k_priv *priv = hw->priv; int i; - for (i = 0; i < priv->num_ampdu_queues; i++) { + for (i = 0; i < MWL8K_NUM_AMPDU_STREAMS; i++) { stream = &priv->ampdu[i]; if (stream->state == AMPDU_NO_STREAM) { stream->sta = sta; stream->state = AMPDU_STREAM_NEW; stream->tid = tid; stream->idx = i; - stream->txq_idx = MWL8K_TX_WMM_QUEUES + i; wiphy_debug(hw->wiphy, "Added a new stream for %pM %d", sta->addr, tid); return stream; @@ -1782,7 +1890,7 @@ struct mwl8k_priv *priv = hw->priv; int i; - for (i = 0 ; i < priv->num_ampdu_queues; i++) { + for (i = 0 ; i < MWL8K_NUM_AMPDU_STREAMS; i++) { struct mwl8k_ampdu_stream *stream; stream = &priv->ampdu[i]; if (stream->state == AMPDU_NO_STREAM) @@ -1829,6 +1937,9 @@ tx_stats->pkts++; } +/* The hardware ampdu queues start from 5 */ +#define BA_QUEUE 5 + static void mwl8k_txq_xmit(struct ieee80211_hw *hw, int index, struct sk_buff *skb) { @@ -1849,6 +1960,7 @@ bool start_ba_session = false; bool mgmtframe = false; struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data; + bool eapol_frame = false; wh = (struct ieee80211_hdr *)skb->data; if (ieee80211_is_data_qos(wh->frame_control)) @@ -1856,6 +1968,9 @@ else qos = 0; + if (skb->protocol == cpu_to_be16(ETH_P_PAE)) + eapol_frame = true; + if (ieee80211_is_mgmt(wh->frame_control)) mgmtframe = true; @@ -1916,7 +2031,7 @@ txpriority = index; if (priv->ap_fw && sta && sta->ht_cap.ht_supported - && skb->protocol != cpu_to_be16(ETH_P_PAE) + && !eapol_frame && ieee80211_is_data_qos(wh->frame_control)) { tid = qos & 0xf; mwl8k_tx_count_packet(sta, tid); @@ -1924,8 +2039,12 @@ stream = mwl8k_lookup_stream(hw, sta->addr, tid); if (stream != NULL) { if (stream->state == AMPDU_STREAM_ACTIVE) { - txpriority = stream->txq_idx; - index = stream->txq_idx; + WARN_ON(!(qos & MWL8K_QOS_ACK_POLICY_BLOCKACK)); + txpriority = (BA_QUEUE + stream->idx) + % TOTAL_HW_TX_QUEUES; + if (stream->idx <= 1) + index = stream->idx + + MWL8K_TX_WMM_QUEUES; } else if (stream->state == AMPDU_STREAM_NEW) { /* We get here if the driver sends us packets * after we've initiated a stream, but before @@ -1967,8 +2086,12 @@ } } spin_unlock(&priv->stream_lock); + } else { + qos &= ~MWL8K_QOS_ACK_POLICY_MASK; + qos |= MWL8K_QOS_ACK_POLICY_NORMAL; } + dma = pci_map_single(priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE); @@ -2003,7 +2126,9 @@ mwl8k_remove_stream(hw, stream); spin_unlock(&priv->stream_lock); } + mwl8k_tx_start(priv); spin_unlock_bh(&priv->tx_lock); + pci_unmap_single(priv->pdev, dma, skb->len, PCI_DMA_TODEVICE); dev_kfree_skb(skb); return; } @@ -2024,9 +2149,11 @@ else tx->peer_id = 0; - if (priv->ap_fw) + if (priv->ap_fw && ieee80211_is_data(wh->frame_control) && !eapol_frame) tx->timestamp = cpu_to_le32(ioread32(priv->regs + MWL8K_HW_TIMER_REGISTER)); + else + tx->timestamp = 0; wmb(); tx->status = cpu_to_le32(MWL8K_TXD_STATUS_FW_OWNED | txstatus); @@ -2076,10 +2203,18 @@ int rc; mutex_lock(&priv->fw_mutex); + if (!priv->is_8764 || priv->hw_restart_in_progress) ieee80211_stop_queues(hw); rc = mwl8k_tx_wait_empty(hw); if (rc) { + /* rc will be non-zero + * if hw_restart is in progress and cmd has come from + * routine other than restart (may be old pending cmd or + * AMPDU) + * + * Above is also true for 8764. + */ if (!priv->hw_restart_in_progress) ieee80211_wake_queues(hw); @@ -2101,7 +2236,8 @@ struct mwl8k_priv *priv = hw->priv; if (!--priv->fw_mutex_depth) { - if (!priv->hw_restart_in_progress) + if (!priv->hw_restart_in_progress && + !priv->is_8764) ieee80211_wake_queues(hw); priv->fw_mutex_owner = NULL; @@ -2128,6 +2264,10 @@ unsigned long timeout = 0; u8 buf[32]; + wiphy_dbg(hw->wiphy, "Posting %s \n", + mwl8k_cmd_name(cmd->code, buf, sizeof(buf))); + + cmd->result = (__force __le16) 0xffff; dma_size = le16_to_cpu(cmd->length); dma_addr = pci_map_single(priv->pdev, cmd, dma_size, @@ -2425,6 +2565,7 @@ if (!rc) { int off; + u8 ap_base_mac[ETH_ALEN]; api_version = le32_to_cpu(cmd->fw_api_version); if (priv->device_info->fw_api_ap != api_version) { @@ -2436,7 +2577,13 @@ rc = -EINVAL; goto done; } + + if (mac_pton(ap_base_mac_addr, ap_base_mac) && + !is_zero_ether_addr(ap_base_mac)) + SET_IEEE80211_PERM_ADDR(hw, ap_base_mac); + else SET_IEEE80211_PERM_ADDR(hw, cmd->perm_addr); + priv->num_mcaddrs = le16_to_cpu(cmd->num_mcaddrs); priv->fw_rev = le32_to_cpu(cmd->fw_rev); priv->hw_rev = cmd->hw_rev; @@ -2510,6 +2657,7 @@ { struct mwl8k_priv *priv = hw->priv; struct mwl8k_cmd_set_hw_spec *cmd; + __le32 flags; int rc; int i; @@ -2535,11 +2683,16 @@ cmd->tx_queue_ptrs[i] = cpu_to_le32(priv->txq[j].txd_dma); } - cmd->flags = cpu_to_le32(MWL8K_SET_HW_SPEC_FLAG_HOST_DECR_MGMT | + flags = MWL8K_SET_HW_SPEC_FLAG_HOST_DECR_MGMT | MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_PROBERESP | MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_BEACON | - MWL8K_SET_HW_SPEC_FLAG_ENABLE_LIFE_TIME_EXPIRY | - MWL8K_SET_HW_SPEC_FLAG_GENERATE_CCMP_HDR); + MWL8K_SET_HW_SPEC_FLAG_GENERATE_CCMP_HDR; + + if (!disable_life_time_expiry) + flags |= MWL8K_SET_HW_SPEC_FLAG_ENABLE_LIFE_TIME_EXPIRY; + + cmd->flags = cpu_to_le32(flags); + cmd->num_tx_desc_per_queue = cpu_to_le32(MWL8K_TX_DESCS); cmd->total_rxd = cpu_to_le32(MWL8K_RX_DESCS); @@ -2674,6 +2827,9 @@ if (cmd == NULL) return -ENOMEM; + if (priv->is_8764) + ieee80211_stop_queues(hw); + cmd->header.code = cpu_to_le16(MWL8K_CMD_RADIO_CONTROL); cmd->header.length = cpu_to_le16(sizeof(*cmd)); cmd->action = cpu_to_le16(MWL8K_CMD_SET); @@ -2683,6 +2839,9 @@ rc = mwl8k_post_cmd(hw, &cmd->header); kfree(cmd); + if (priv->is_8764) + ieee80211_wake_queues(hw); + if (!rc) priv->radio_on = enable; @@ -2818,12 +2977,16 @@ mwl8k_cmd_rf_antenna(struct ieee80211_hw *hw, int antenna, int mask) { struct mwl8k_cmd_rf_antenna *cmd; + struct mwl8k_priv *priv = hw->priv; int rc; cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); if (cmd == NULL) return -ENOMEM; + if (priv->is_8764) + ieee80211_stop_queues(hw); + cmd->header.code = cpu_to_le16(MWL8K_CMD_RF_ANTENNA); cmd->header.length = cpu_to_le16(sizeof(*cmd)); cmd->antenna = cpu_to_le16(antenna); @@ -2832,6 +2995,9 @@ rc = mwl8k_post_cmd(hw, &cmd->header); kfree(cmd); + if (priv->is_8764) + ieee80211_wake_queues(hw); + return rc; } @@ -2935,12 +3101,16 @@ { struct ieee80211_channel *channel = conf->channel; struct mwl8k_cmd_set_rf_channel *cmd; + struct mwl8k_priv *priv = hw->priv; int rc; cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); if (cmd == NULL) return -ENOMEM; + if (priv->is_8764) + ieee80211_stop_queues(hw); + cmd->header.code = cpu_to_le16(MWL8K_CMD_SET_RF_CHANNEL); cmd->header.length = cpu_to_le16(sizeof(*cmd)); cmd->action = cpu_to_le16(MWL8K_CMD_SET); @@ -2962,6 +3132,9 @@ rc = mwl8k_post_cmd(hw, &cmd->header); kfree(cmd); + if (priv->is_8764) + ieee80211_wake_queues(hw); + return rc; } @@ -3570,7 +3743,11 @@ return rc; } -#define INVALID_BA 0xAA +#define MWL8K_WMM_QUEUE_NUMBER 3 + +static void mwl8k_destroy_ba(struct ieee80211_hw *hw, + u8 idx); + static void mwl8k_watchdog_ba_events(struct work_struct *work) { int rc; @@ -3578,24 +3755,43 @@ struct mwl8k_ampdu_stream *streams; struct mwl8k_priv *priv = container_of(work, struct mwl8k_priv, watchdog_ba_handle); + struct ieee80211_hw *hw = priv->hw; + int i; + u32 status = 0; + + mwl8k_fw_lock(hw); rc = mwl8k_cmd_get_watchdog_bitmap(priv->hw, &bitmap); if (rc) - return; + goto done; - if (bitmap == INVALID_BA) - return; + spin_lock(&priv->stream_lock); /* the bitmap is the hw queue number. Map it to the ampdu queue. */ - stream_index = bitmap - MWL8K_TX_WMM_QUEUES; - - BUG_ON(stream_index >= priv->num_ampdu_queues); - + for (i = 0; i < TOTAL_HW_TX_QUEUES; i++) { + if ( bitmap & (1 << i)) { + stream_index = (i + MWL8K_WMM_QUEUE_NUMBER) + % TOTAL_HW_TX_QUEUES; streams = &priv->ampdu[stream_index]; + if (streams->state == AMPDU_STREAM_ACTIVE) { + ieee80211_stop_tx_ba_session(streams->sta, + streams->tid); + spin_unlock(&priv->stream_lock); + mwl8k_destroy_ba(hw, stream_index); + spin_lock(&priv->stream_lock); - if (streams->state == AMPDU_STREAM_ACTIVE) - ieee80211_stop_tx_ba_session(streams->sta, streams->tid); + } + } + } + spin_unlock(&priv->stream_lock); +done: + if (!priv->is_8764) + atomic_dec(&priv->watchdog_event_pending); + status = ioread32(priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS_MASK); + iowrite32((status | MWL8K_A2H_INT_BA_WATCHDOG), + priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS_MASK); + mwl8k_fw_unlock(hw); return; } @@ -3678,7 +3874,7 @@ } __packed; static int -mwl8k_check_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream) +mwl8k_check_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream, struct ieee80211_vif *vif) { struct mwl8k_cmd_bastream *cmd; int rc; @@ -3701,7 +3897,7 @@ cpu_to_le32(BASTREAM_FLAG_IMMEDIATE_TYPE) | cpu_to_le32(BASTREAM_FLAG_DIRECTION_UPSTREAM); - rc = mwl8k_post_cmd(hw, &cmd->header); + rc = mwl8k_post_pervif_cmd(hw, vif, &cmd->header); kfree(cmd); @@ -3710,7 +3906,7 @@ static int mwl8k_create_ba(struct ieee80211_hw *hw, struct mwl8k_ampdu_stream *stream, - u8 buf_size) + u8 buf_size, struct ieee80211_vif *vif) { struct mwl8k_cmd_bastream *cmd; int rc; @@ -3744,7 +3940,7 @@ cpu_to_le32(BASTREAM_FLAG_IMMEDIATE_TYPE | BASTREAM_FLAG_DIRECTION_UPSTREAM); - rc = mwl8k_post_cmd(hw, &cmd->header); + rc = mwl8k_post_pervif_cmd(hw, vif, &cmd->header); wiphy_debug(hw->wiphy, "Created a BA stream for %pM : tid %d\n", stream->sta->addr, stream->tid); @@ -3754,7 +3950,7 @@ } static void mwl8k_destroy_ba(struct ieee80211_hw *hw, - struct mwl8k_ampdu_stream *stream) + u8 idx) { struct mwl8k_cmd_bastream *cmd; @@ -3766,10 +3962,10 @@ cmd->header.length = cpu_to_le16(sizeof(*cmd)); cmd->action = cpu_to_le32(MWL8K_BA_DESTROY); - cmd->destroy_params.ba_context = cpu_to_le32(stream->idx); + cmd->destroy_params.ba_context = cpu_to_le32(idx); mwl8k_post_cmd(hw, &cmd->header); - wiphy_debug(hw->wiphy, "Deleted BA stream index %d\n", stream->idx); + wiphy_debug(hw->wiphy, "Deleted BA stream index %d\n", idx); kfree(cmd); } @@ -3866,7 +4062,37 @@ struct ieee80211_vif *vif, u8 *addr) { struct mwl8k_cmd_set_new_stn *cmd; - int rc; + struct mwl8k_priv *priv = hw->priv; + int rc, i; + u8 idx; + + spin_lock(&priv->stream_lock); + /* Destroy any active ampdu streams for this sta */ + for (i = 0; i < MWL8K_NUM_AMPDU_STREAMS; i++) + { + struct mwl8k_ampdu_stream *s; + s = &priv->ampdu[i]; + if (s->state != AMPDU_NO_STREAM) + { + if (memcmp(s->sta->addr, addr, ETH_ALEN) == 0) { + if (s->state == AMPDU_STREAM_ACTIVE) { + wiphy_debug(hw->wiphy, "AMPDU stream active for" + "ra/tid %pM/%d\n", s->sta->addr, + s->tid); + idx = s->idx; + spin_unlock(&priv->stream_lock); + mwl8k_destroy_ba(hw, idx); + spin_lock(&priv->stream_lock); + } + else if(s->state == AMPDU_STREAM_NEW) { + printk("<1> Removing stream for tid in sta_remove %d\n", s->tid); + mwl8k_remove_stream(hw, s); + } + } + } + } + + spin_unlock(&priv->stream_lock); cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); if (cmd == NULL) @@ -4292,6 +4518,11 @@ } if (status & MWL8K_A2H_INT_BA_WATCHDOG) { + + iowrite32(~MWL8K_A2H_INT_BA_WATCHDOG, + priv->regs + MWL8K_HIU_A2H_INTERRUPT_STATUS_MASK); + if (!priv->is_8764) + atomic_inc(&priv->watchdog_event_pending); status &= ~MWL8K_A2H_INT_BA_WATCHDOG; ieee80211_queue_work(hw, &priv->watchdog_ba_handle); } @@ -4327,7 +4558,8 @@ for (i = 0; i < mwl8k_tx_queues(priv); i++) limit -= mwl8k_txq_reclaim(hw, i, limit, 0); - if (!priv->pending_tx_pkts && priv->tx_wait != NULL) { + if ((!priv->pending_tx_pkts || (priv->is_8764 && limit != 32)) && + priv->tx_wait != NULL) { complete(priv->tx_wait); priv->tx_wait = NULL; } @@ -4433,7 +4665,8 @@ priv->irq = -1; tasklet_disable(&priv->poll_tx_task); tasklet_disable(&priv->poll_rx_task); - } + } else + ieee80211_wake_queues(hw); return rc; } @@ -4605,6 +4838,9 @@ */ mwl8k_fw_unlock(hw); + if (priv->is_8764) + ieee80211_wake_queues(hw); + ieee80211_restart_hw(hw); wiphy_err(hw->wiphy, "Firmware restarted successfully\n"); @@ -4635,9 +4871,11 @@ if (rc) goto out; + if (changed & IEEE80211_CONF_CHANGE_CHANNEL) { rc = mwl8k_cmd_set_rf_channel(hw, conf); if (rc) goto out; + } if (conf->power_level > 18) conf->power_level = 18; @@ -4650,9 +4888,16 @@ goto out; } + if (priv->is_8764) + rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_RX, 0x4); + else rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_RX, 0x3); if (rc) wiphy_warn(hw->wiphy, "failed to set # of RX antennas"); + + if (priv->is_8764) + rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_TX, 0xf); + else rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_TX, 0x7); if (rc) wiphy_warn(hw->wiphy, "failed to set # of TX antennas"); @@ -5081,7 +5326,8 @@ int i, rc = 0; struct mwl8k_priv *priv = hw->priv; struct mwl8k_ampdu_stream *stream; - u8 *addr = sta->addr; + struct mwl8k_sta *sta_info = MWL8K_STA(sta); + u8 *addr = sta->addr, idx; if (!(hw->flags & IEEE80211_HW_AMPDU_AGGREGATION)) return -ENOTSUPP; @@ -5124,7 +5370,15 @@ /* Release the lock before we do the time consuming stuff */ spin_unlock(&priv->stream_lock); for (i = 0; i < MAX_AMPDU_ATTEMPTS; i++) { - rc = mwl8k_check_ba(hw, stream); + /* Check if link is still valid */ + if (!sta_info->is_ampdu_allowed) { + spin_lock(&priv->stream_lock); + mwl8k_remove_stream(hw, stream); + spin_unlock(&priv->stream_lock); + return -EBUSY; + } + + rc = mwl8k_check_ba(hw, stream, vif); /* If HW restart is in progress mwl8k_post_cmd will * return -EBUSY. Avoid retrying mwl8k_check_ba in @@ -5152,8 +5406,9 @@ case IEEE80211_AMPDU_TX_STOP: if (stream) { if (stream->state == AMPDU_STREAM_ACTIVE) { + idx = stream->idx; spin_unlock(&priv->stream_lock); - mwl8k_destroy_ba(hw, stream); + mwl8k_destroy_ba(hw, idx); spin_lock(&priv->stream_lock); } mwl8k_remove_stream(hw, stream); @@ -5164,13 +5419,15 @@ BUG_ON(stream == NULL); BUG_ON(stream->state != AMPDU_STREAM_IN_PROGRESS); spin_unlock(&priv->stream_lock); - rc = mwl8k_create_ba(hw, stream, buf_size); + rc = mwl8k_create_ba(hw, stream, buf_size, vif); spin_lock(&priv->stream_lock); - if (!rc) + if (!rc) { stream->state = AMPDU_STREAM_ACTIVE; + } else { + idx = stream->idx; spin_unlock(&priv->stream_lock); - mwl8k_destroy_ba(hw, stream); + mwl8k_destroy_ba(hw, idx); spin_lock(&priv->stream_lock); wiphy_debug(hw->wiphy, "Failed adding stream for sta %pM tid %d\n", @@ -5231,12 +5488,17 @@ MWL8363 = 0, MWL8687, MWL8366, + MWL8764, }; -#define MWL8K_8366_AP_FW_API 2 +#define MWL8K_8366_AP_FW_API 4 #define _MWL8K_8366_AP_FW(api) "mwl8k/fmimage_8366_ap-" #api ".fw" #define MWL8K_8366_AP_FW(api) _MWL8K_8366_AP_FW(api) +#define MWL8K_8764_AP_FW_API 2 +#define _MWL8K_8764_AP_FW(api) "mwl8k/fmimage_8764_ap-" #api ".fw" +#define MWL8K_8764_AP_FW(api) _MWL8K_8764_AP_FW(api) + static struct mwl8k_device_info mwl8k_info_tbl[] __devinitdata = { [MWL8363] = { .part_name = "88w8363", @@ -5254,7 +5516,13 @@ .fw_image_sta = "mwl8k/fmimage_8366.fw", .fw_image_ap = MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API), .fw_api_ap = MWL8K_8366_AP_FW_API, - .ap_rxd_ops = &rxd_8366_ap_ops, + .ap_rxd_ops = &rxd_ap_ops, + }, + [MWL8764] = { + .part_name = "88w8764", + .fw_image_ap = MWL8K_8764_AP_FW(MWL8K_8764_AP_FW_API), + .fw_api_ap = MWL8K_8764_AP_FW_API, + .ap_rxd_ops = &rxd_ap_ops, }, }; @@ -5265,6 +5533,7 @@ MODULE_FIRMWARE("mwl8k/helper_8366.fw"); MODULE_FIRMWARE("mwl8k/fmimage_8366.fw"); MODULE_FIRMWARE(MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API)); +MODULE_FIRMWARE(MWL8K_8764_AP_FW(MWL8K_8764_AP_FW_API)); static DEFINE_PCI_DEVICE_TABLE(mwl8k_pci_id_table) = { { PCI_VDEVICE(MARVELL, 0x2a0a), .driver_data = MWL8363, }, @@ -5274,6 +5543,7 @@ { PCI_VDEVICE(MARVELL, 0x2a30), .driver_data = MWL8687, }, { PCI_VDEVICE(MARVELL, 0x2a40), .driver_data = MWL8366, }, { PCI_VDEVICE(MARVELL, 0x2a43), .driver_data = MWL8366, }, + { PCI_VDEVICE(MARVELL, 0x2b36), .driver_data = MWL8764, }, { }, }; MODULE_DEVICE_TABLE(pci, mwl8k_pci_id_table); @@ -5447,9 +5717,12 @@ priv->rxd_ops = &rxd_sta_ops; } + priv->booted = false; priv->sniffer_enabled = false; priv->wmm_enabled = false; priv->pending_tx_pkts = 0; + if (!priv->is_8764) + atomic_set(&priv->watchdog_event_pending, 0); rc = mwl8k_rxq_init(hw, 0); if (rc) @@ -5540,6 +5813,8 @@ (priv->fw_rev >> 24) & 0xff, (priv->fw_rev >> 16) & 0xff, (priv->fw_rev >> 8) & 0xff, priv->fw_rev & 0xff); + priv->booted = true; + return 0; err_free_irq: @@ -5614,6 +5889,18 @@ return rc; } +static const struct ieee80211_iface_limit ap_if_limits[] = { + { .max = 8, .types = BIT(NL80211_IFTYPE_AP) }, +}; + +static const struct ieee80211_iface_combination ap_if_comb = { + .limits = ap_if_limits, + .n_limits = ARRAY_SIZE(ap_if_limits), + .max_interfaces = 8, + .num_different_channels = 1, +}; + + static int mwl8k_firmware_load_success(struct mwl8k_priv *priv) { struct ieee80211_hw *hw = priv->hw; @@ -5665,6 +5952,8 @@ INIT_WORK(&priv->watchdog_ba_handle, mwl8k_watchdog_ba_events); /* To reload the firmware if it crashes */ INIT_WORK(&priv->fw_reload, mwl8k_hw_restart_work); + /* To check if firmware is stuck or has crashed */ + INIT_WORK(&priv->fw_check, mwl8k_check_fw_state); /* TX reclaim and RX tasklets. */ tasklet_init(&priv->poll_tx_task, mwl8k_tx_poll, (unsigned long)hw); @@ -5693,8 +5982,13 @@ goto err_free_cookie; hw->wiphy->interface_modes = 0; - if (priv->ap_macids_supported || priv->device_info->fw_image_ap) + + if (priv->ap_macids_supported || priv->device_info->fw_image_ap) { hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP); + hw->wiphy->iface_combinations = &ap_if_comb; + hw->wiphy->n_iface_combinations = 1; + } + if (priv->sta_macids_supported || priv->device_info->fw_image_sta) hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_STATION); @@ -5765,6 +6059,8 @@ priv->pdev = pdev; priv->device_info = &mwl8k_info_tbl[id->driver_data]; + if (id->driver_data == MWL8764) + priv->is_8764 = true; priv->sram = pci_iomap(pdev, 0, 0x10000); if (priv->sram == NULL) { diff -ruw linux-3.6.7/drivers/pci/quirks.c linux-3.6.7-fbx/drivers/pci/quirks.c --- linux-3.6.7/drivers/pci/quirks.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/pci/quirks.c 2014-04-17 16:28:13.489099327 +0200 @@ -2618,6 +2618,8 @@ } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge); +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_PERICOM, PCI_DEVICE_ID_PI7C9X20303SL, + quirk_hotplug_bridge); /* * This is a quirk for the Ricoh MMC controller found as a part of diff -ruw linux-3.6.7/drivers/platform/Kconfig linux-3.6.7-fbx/drivers/platform/Kconfig --- linux-3.6.7/drivers/platform/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/platform/Kconfig 2014-04-17 16:28:13.665102717 +0200 @@ -1,3 +1,11 @@ if X86 source "drivers/platform/x86/Kconfig" endif + +if TANGO2 +source "drivers/platform/tango2/Kconfig" +endif + +if X86_INTEL_CE +source "drivers/platform/intelce/Kconfig" +endif diff -ruw linux-3.6.7/drivers/platform/Makefile linux-3.6.7-fbx/drivers/platform/Makefile --- linux-3.6.7/drivers/platform/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/platform/Makefile 2014-04-17 16:28:13.665102717 +0200 @@ -4,3 +4,5 @@ obj-$(CONFIG_X86) += x86/ obj-$(CONFIG_OLPC) += olpc/ +obj-$(CONFIG_TANGO2) += tango2/ +obj-$(CONFIG_X86_INTEL_CE) += intelce/ diff -ruw linux-3.6.7/drivers/spi/Kconfig linux-3.6.7-fbx/drivers/spi/Kconfig --- linux-3.6.7/drivers/spi/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/spi/Kconfig 2014-04-17 16:28:14.869125911 +0200 @@ -282,6 +282,12 @@ help This selects a driver for the PPC4xx SPI Controller. +config SPI_TDM_ORION + tristate "Orion TDM SPI master" + depends on PLAT_ORION + help + This enables using the TDM SPI master controller on the Orion chips. + config SPI_PXA2XX tristate "PXA2xx SSP SPI master" depends on (ARCH_PXA || (X86_32 && PCI)) && EXPERIMENTAL diff -ruw linux-3.6.7/drivers/spi/Makefile linux-3.6.7-fbx/drivers/spi/Makefile --- linux-3.6.7/drivers/spi/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/spi/Makefile 2014-04-17 16:28:14.869125911 +0200 @@ -42,6 +42,7 @@ obj-$(CONFIG_SPI_OMAP_100K) += spi-omap-100k.o obj-$(CONFIG_SPI_OMAP24XX) += spi-omap2-mcspi.o obj-$(CONFIG_SPI_ORION) += spi-orion.o +obj-$(CONFIG_SPI_TDM_ORION) += orion_tdm_spi.o obj-$(CONFIG_SPI_PL022) += spi-pl022.o obj-$(CONFIG_SPI_PPC4xx) += spi-ppc4xx.o obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx.o @@ -64,4 +65,3 @@ obj-$(CONFIG_SPI_TXX9) += spi-txx9.o obj-$(CONFIG_SPI_XCOMM) += spi-xcomm.o obj-$(CONFIG_SPI_XILINX) += spi-xilinx.o - diff -ruw linux-3.6.7/drivers/tty/serial/8250/8250.c linux-3.6.7-fbx/drivers/tty/serial/8250/8250.c --- linux-3.6.7/drivers/tty/serial/8250/8250.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/tty/serial/8250/8250.c 2014-04-17 16:28:16.917165364 +0200 @@ -42,6 +42,12 @@ #include #endif +#ifdef CONFIG_TANGO2 +#include + +extern unsigned long em8xxx_sys_frequency; +#endif + #include #include @@ -292,20 +298,30 @@ }, }; + /* Uart divisor latch read */ static int default_serial_dl_read(struct uart_8250_port *up) { +#ifndef CONFIG_TANGO2 return serial_in(up, UART_DLL) | serial_in(up, UART_DLM) << 8; +#else + BUG(); + return 0; +#endif } /* Uart divisor latch write */ static void default_serial_dl_write(struct uart_8250_port *up, int value) { +#ifndef CONFIG_TANGO2 serial_out(up, UART_DLL, value & 0xff); serial_out(up, UART_DLM, value >> 8 & 0xff); +#else + BUG(); +#endif } -#ifdef CONFIG_MIPS_ALCHEMY +#if defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_WINTEGRA_WINPATH3) /* Au1x00 UART hardware has a weird register layout */ static const u8 au_io_in_map[] = { @@ -417,14 +433,44 @@ static unsigned int mem_serial_in(struct uart_port *p, int offset) { +#ifdef CONFIG_TANGO2 + unsigned long v; + + /* no EFR on tango2 */ + if (offset == UART_EFR) + v = 0; + else + v = gbus_readl((unsigned long)p->membase + + (offset << p->regshift)); + return v; +#else offset = offset << p->regshift; return readb(p->membase + offset); +#endif } static void mem_serial_out(struct uart_port *p, int offset, int value) { +#ifdef CONFIG_TANGO2 + /* + * we add a special case for UART_DL register, since + * register content has a different meaning for us. + */ + if (offset == UART_DL) { + /* select right clock source */ + value = (em8xxx_sys_frequency / p->uartclk); + } + + /* no EFR on tango2 */ + if (offset != UART_EFR) { + offset = offset << p->regshift; + gbus_writel((unsigned long)p->membase + offset, + value); + } +#else offset = offset << p->regshift; writeb(value, p->membase + offset); +#endif } static void mem32_serial_out(struct uart_port *p, int offset, int value) @@ -486,7 +532,7 @@ break; #endif -#ifdef CONFIG_MIPS_ALCHEMY +#if defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_WINTEGRA_WINPATH3) case UPIO_AU: p->serial_in = au_serial_in; p->serial_out = au_serial_out; @@ -662,7 +708,11 @@ static int size_fifo(struct uart_8250_port *up) { unsigned char old_fcr, old_mcr, old_lcr; +#ifdef CONFIG_TANGO2 + unsigned short old_dll, old_dlm; +#else unsigned short old_dl; +#endif int count; old_lcr = serial_in(up, UART_LCR); @@ -673,8 +723,14 @@ UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT); serial_out(up, UART_MCR, UART_MCR_LOOP); serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A); +#ifdef CONFIG_TANGO2 + old_dll = serial_in(up, UART_DL) & 0xff; + old_dlm = serial_in(up, UART_DL) >> 8; + serial_out(up, UART_DL, 0x01); +#else old_dl = serial_dl_read(up); serial_dl_write(up, 0x0001); +#endif serial_out(up, UART_LCR, 0x03); for (count = 0; count < 256; count++) serial_out(up, UART_TX, count); @@ -685,7 +741,11 @@ serial_out(up, UART_FCR, old_fcr); serial_out(up, UART_MCR, old_mcr); serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A); +#ifdef CONFIG_TANGO2 + serial_out(up, UART_DL, (old_dlm << 8) | old_dll); +#else serial_dl_write(up, old_dl); +#endif serial_out(up, UART_LCR, old_lcr); return count; @@ -704,6 +764,16 @@ old_lcr = serial_in(p, UART_LCR); serial_out(p, UART_LCR, UART_LCR_CONF_MODE_A); +#ifdef CONFIG_TANGO2 + old_dll = serial_in(p, UART_DL) & 0xff; + old_dlm = serial_in(p, UART_DL) >> 8; + + serial_out(p, UART_DL, 0); + + id = serial_in(p, UART_DL); + + serial_out(p, UART_DL, (old_dlm << 8) | old_dll); +#else old_dll = serial_in(p, UART_DLL); old_dlm = serial_in(p, UART_DLM); @@ -714,6 +784,7 @@ serial_out(p, UART_DLL, old_dll); serial_out(p, UART_DLM, old_dlm); +#endif serial_out(p, UART_LCR, old_lcr); return id; @@ -932,11 +1003,19 @@ serial_out(up, UART_LCR, 0xE0); +#ifdef CONFIG_TANGO2 + quot = serial_in(up, UART_DL); +#else quot = serial_dl_read(up); +#endif quot <<= 3; if (ns16550a_goto_highspeed(up)) +#ifdef CONFIG_TANGO2 + serial_out(up, UART_DL, quot); +#else serial_dl_write(up, quot); +#endif serial_out(up, UART_LCR, 0); @@ -2356,7 +2435,11 @@ else serial_port_out(port, UART_LCR, cval | UART_LCR_DLAB); +#ifdef CONFIG_TANGO2 + serial_out(up, UART_DL, quot); +#else serial_dl_write(up, quot); +#endif /* * LCR DLAB must be set to enable 64-byte FIFO mode. If the FCR diff -ruw linux-3.6.7/drivers/tty/serial/8250/8250_early.c linux-3.6.7-fbx/drivers/tty/serial/8250/8250_early.c --- linux-3.6.7/drivers/tty/serial/8250/8250_early.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/tty/serial/8250/8250_early.c 2014-04-17 16:28:16.933165673 +0200 @@ -121,8 +121,13 @@ lcr = serial_in(port, UART_LCR); serial_out(port, UART_LCR, lcr | UART_LCR_DLAB); +#ifdef CONFIG_TANGO2 + dll = serial_in(port, UART_DL) & 0xff; + dlm = serial_in(port, UART_DL) >> 8; +#else dll = serial_in(port, UART_DLL); dlm = serial_in(port, UART_DLM); +#endif serial_out(port, UART_LCR, lcr); quot = (dlm << 8) | dll; @@ -143,8 +148,12 @@ divisor = port->uartclk / (16 * device->baud); c = serial_in(port, UART_LCR); serial_out(port, UART_LCR, c | UART_LCR_DLAB); +#ifdef CONFIG_TANGO2 + serial_out(port, UART_DL, divisor & 0xffff); +#else serial_out(port, UART_DLL, divisor & 0xff); serial_out(port, UART_DLM, (divisor >> 8) & 0xff); +#endif serial_out(port, UART_LCR, c & ~UART_LCR_DLAB); } diff -ruw linux-3.6.7/drivers/tty/serial/8250/8250_pci.c linux-3.6.7-fbx/drivers/tty/serial/8250/8250_pci.c --- linux-3.6.7/drivers/tty/serial/8250/8250_pci.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/tty/serial/8250/8250_pci.c 2014-04-17 16:28:16.933165673 +0200 @@ -1061,7 +1061,7 @@ { int ret; - ret = setup_port(priv, port, 0, 0, board->reg_shift); + ret = setup_port(priv, port, idx, 0, board->reg_shift); port->iotype = UPIO_MEM32; port->type = PORT_XSCALE; port->flags = (port->flags | UPF_FIXED_PORT | UPF_FIXED_TYPE); @@ -2608,8 +2608,8 @@ .first_offset = 0x1000, }, [pbn_ce4100_1_115200] = { - .flags = FL_BASE0, - .num_ports = 1, + .flags = FL_BASE_BARS, + .num_ports = 2, .base_baud = 921600, .reg_shift = 2, }, diff -ruw linux-3.6.7/drivers/usb/gadget/Kconfig linux-3.6.7-fbx/drivers/usb/gadget/Kconfig --- linux-3.6.7/drivers/usb/gadget/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/usb/gadget/Kconfig 2014-04-17 16:28:17.189170604 +0200 @@ -162,7 +162,7 @@ config USB_FSL_USB2 tristate "Freescale Highspeed USB DR Peripheral Controller" - depends on FSL_SOC || ARCH_MXC + depends on FSL_SOC || ARCH_MXC || PLAT_ORION select USB_GADGET_DUALSPEED select USB_FSL_MPH_DR_OF if OF help diff -ruw linux-3.6.7/drivers/usb/gadget/Makefile linux-3.6.7-fbx/drivers/usb/gadget/Makefile --- linux-3.6.7/drivers/usb/gadget/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/usb/gadget/Makefile 2014-04-17 16:28:17.189170604 +0200 @@ -19,6 +19,7 @@ obj-$(CONFIG_USB_FSL_USB2) += fsl_usb2_udc.o fsl_usb2_udc-y := fsl_udc_core.o fsl_usb2_udc-$(CONFIG_ARCH_MXC) += fsl_mxc_udc.o +fsl_usb2_udc-$(CONFIG_PLAT_ORION) += fsl_orion_udc.o obj-$(CONFIG_USB_M66592) += m66592-udc.o obj-$(CONFIG_USB_R8A66597) += r8a66597-udc.o obj-$(CONFIG_USB_FSL_QE) += fsl_qe_udc.o diff -ruw linux-3.6.7/drivers/usb/host/ehci-hcd.c linux-3.6.7-fbx/drivers/usb/host/ehci-hcd.c --- linux-3.6.7/drivers/usb/host/ehci-hcd.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/usb/host/ehci-hcd.c 2014-04-17 16:28:17.293172607 +0200 @@ -1339,6 +1339,16 @@ #define PLATFORM_DRIVER ehci_platform_driver #endif +#ifdef CONFIG_USB_EHCI_BCM63XX +#include "ehci-bcm63xx.c" +#define PLATFORM_DRIVER ehci_hcd_bcm63xx_driver +#endif + +#ifdef CONFIG_TANGO2 +#include "ehci-tango2.c" +#define PLATFORM_DRIVER ehci_hcd_tango2_driver +#endif + #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \ !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \ !defined(XILINX_OF_PLATFORM_DRIVER) diff -ruw linux-3.6.7/drivers/usb/host/ehci-hub.c linux-3.6.7-fbx/drivers/usb/host/ehci-hub.c --- linux-3.6.7/drivers/usb/host/ehci-hub.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/usb/host/ehci-hub.c 2014-04-17 16:28:17.293172607 +0200 @@ -814,12 +814,14 @@ * power switching; they're allowed to just limit the * current. khubd will turn the power back on. */ +#ifndef CONFIG_BCM63XX if ((temp & PORT_OC) && HCS_PPC(ehci->hcs_params)) { ehci_writel(ehci, temp & ~(PORT_RWC_BITS | PORT_POWER), status_reg); temp = ehci_readl(ehci, status_reg); } +#endif } /* whoever resumes must GetPortStatus to complete it!! */ diff -ruw linux-3.6.7/drivers/usb/host/ehci-orion.c linux-3.6.7-fbx/drivers/usb/host/ehci-orion.c --- linux-3.6.7/drivers/usb/host/ehci-orion.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/usb/host/ehci-orion.c 2014-04-17 16:28:17.293172607 +0200 @@ -26,6 +26,7 @@ #define USB_WINDOW_BASE(i) (0x324 + ((i) << 4)) #define USB_IPG 0x360 #define USB_PHY_PWR_CTRL 0x400 +#define USB_PHY_PLL_CTRL 0x410 #define USB_PHY_TX_CTRL 0x420 #define USB_PHY_RX_CTRL 0x430 #define USB_PHY_IVREF_CTRL 0x440 @@ -101,6 +102,70 @@ wrl(USB_MODE, 0x13); } +/* + * Implement Kirkwood USB controller specification guidelines + */ +static void orion_usb_phy_kw_setup(struct usb_hcd *hcd) +{ + u32 val; + + /* + * Clear interrupt cause and mask + */ + wrl(USB_CAUSE, 0); + wrl(USB_MASK, 0); + + /* + * Reset controller + */ + wrl(USB_CMD, rdl(USB_CMD) | 0x2); + while (rdl(USB_CMD) & 0x2); + + /* + * GL# USB-10: Set IPG for non start of frame packets + * Bits[14:8]=0xd + */ + wrl(USB_IPG, (rdl(USB_IPG) & ~0x7f00) | 0xd00); + + val = rdl(USB_PHY_PLL_CTRL); + val |= (1 << 21); + wrl(USB_PHY_PLL_CTRL, val); + udelay(100); + val &= ~(1 << 21); + wrl(USB_PHY_PLL_CTRL, val); + + + val = rdl(USB_PHY_TX_CTRL); + val |= (1 << 12); + wrl(USB_PHY_TX_CTRL, val); + udelay(100); + val &= ~(1 << 12); + wrl(USB_PHY_TX_CTRL, val); + val &= ~0x7; + val |= 0x4; + wrl(USB_PHY_TX_CTRL, val); + + + val = rdl(USB_PHY_RX_CTRL); + val &= ~(0xf << 4); + val |= (0x8 << 4); + wrl(USB_PHY_RX_CTRL, val); + + /* + * Stop and reset controller + */ + wrl(USB_CMD, rdl(USB_CMD) & ~0x1); + wrl(USB_CMD, rdl(USB_CMD) | 0x2); + while (rdl(USB_CMD) & 0x2); + + /* + * GL# USB-5 Streaming disable REG_USB_MODE[4]=1 + * TBD: This need to be done after each reset! + * GL# USB-4 Setup USB Host mode + */ + wrl(USB_MODE, 0x13); +} + static int ehci_orion_setup(struct usb_hcd *hcd) { struct ehci_hcd *ehci = hcd_to_ehci(hcd); @@ -268,8 +333,10 @@ case EHCI_PHY_ORION: orion_usb_phy_v1_setup(hcd); break; - case EHCI_PHY_DD: case EHCI_PHY_KW: + orion_usb_phy_kw_setup(hcd); + break; + case EHCI_PHY_DD: default: printk(KERN_WARNING "Orion ehci -USB phy version isn't supported.\n"); } diff -ruw linux-3.6.7/drivers/usb/host/Kconfig linux-3.6.7-fbx/drivers/usb/host/Kconfig --- linux-3.6.7/drivers/usb/host/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/usb/host/Kconfig 2014-04-17 16:28:17.289172531 +0200 @@ -110,7 +110,7 @@ depends on USB_EHCI_HCD && (PPC_CELLEB || PPC_PS3 || 440EPX || \ ARCH_IXP4XX || XPS_USB_HCD_XILINX || \ PPC_MPC512x || CPU_CAVIUM_OCTEON || \ - PMC_MSP || SPARC_LEON || MIPS_SEAD3) + PMC_MSP || SPARC_LEON || MIPS_SEAD3 || BCM63XX) default y config USB_EHCI_BIG_ENDIAN_DESC @@ -134,6 +134,14 @@ config USB_FSL_MPH_DR_OF tristate +config USB_EHCI_BCM63XX + bool "Support for Broadcom 63xx on-chip EHCI USB controller" + depends on USB_EHCI_HCD && BCM63XX + select USB_EHCI_BIG_ENDIAN_MMIO + ---help--- + Enables support for the on-chip EHCI controller on + BCM6358 and later chips. + config USB_EHCI_FSL bool "Support for Freescale PPC on-chip EHCI USB controller" depends on USB_EHCI_HCD && FSL_SOC @@ -306,6 +314,15 @@ To compile this driver as a module, choose M here: the module will be called ohci-hcd. +config USB_OHCI_BCM63XX + bool "Support for Broadcom 63xx on-chip OHCI USB controller" + depends on USB_OHCI_HCD && BCM63XX + select USB_OHCI_BIG_ENDIAN_DESC + select USB_OHCI_BIG_ENDIAN_MMIO + ---help--- + Enables support for the on-chip OHCI controller on + BCM63XX chips. + config USB_OHCI_HCD_OMAP1 bool "OHCI support for OMAP1/2 chips" depends on USB_OHCI_HCD && ARCH_OMAP1 diff -ruw linux-3.6.7/drivers/usb/serial/cp210x.c linux-3.6.7-fbx/drivers/usb/serial/cp210x.c --- linux-3.6.7/drivers/usb/serial/cp210x.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/usb/serial/cp210x.c 2014-04-17 16:28:24.453310536 +0200 @@ -60,6 +60,7 @@ { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ { USB_DEVICE(0x0489, 0xE003) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */ { USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */ + { USB_DEVICE(0x0489, 0xE003) }, /* Pirelli wifi/GSM phone */ { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */ { USB_DEVICE(0x0BED, 0x1100) }, /* MEI (TM) Cashflow-SC Bill/Voucher Acceptor */ diff -ruw linux-3.6.7/drivers/usb/storage/usb.c linux-3.6.7-fbx/drivers/usb/storage/usb.c --- linux-3.6.7/drivers/usb/storage/usb.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/usb/storage/usb.c 2014-04-17 16:28:33.169478435 +0200 @@ -78,7 +78,7 @@ MODULE_DESCRIPTION("USB Mass Storage driver for Linux"); MODULE_LICENSE("GPL"); -static unsigned int delay_use = 1; +static unsigned int delay_use = 5; module_param(delay_use, uint, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(delay_use, "seconds to delay before using a new device"); diff -ruw linux-3.6.7/drivers/video/Kconfig linux-3.6.7-fbx/drivers/video/Kconfig --- linux-3.6.7/drivers/video/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/video/Kconfig 2014-04-17 16:28:38.321577676 +0200 @@ -477,6 +477,17 @@ this driver, say Y or M; otherwise say N. You must specify the GPIO IO address to be used for setting control and data. +config FB_SSD1327 + tristate "SSD1327 OLED driver" + depends on FB + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS + select FB_BACKLIGHT + select SPI + default n + config FB_ATARI bool "Atari native chipset support" depends on (FB = y) && ATARI diff -ruw linux-3.6.7/drivers/video/Makefile linux-3.6.7-fbx/drivers/video/Makefile --- linux-3.6.7/drivers/video/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/drivers/video/Makefile 2014-04-17 16:28:38.393579064 +0200 @@ -33,6 +33,7 @@ # Hardware specific drivers go first obj-$(CONFIG_FB_AMIGA) += amifb.o c2p_planar.o obj-$(CONFIG_FB_ARC) += arcfb.o +obj-$(CONFIG_FB_SSD1327) += ssd1327.o obj-$(CONFIG_FB_CLPS711X) += clps711xfb.o obj-$(CONFIG_FB_CYBER2000) += cyber2000fb.o obj-$(CONFIG_FB_GRVGA) += grvga.o diff -ruw linux-3.6.7/firmware/Makefile linux-3.6.7-fbx/firmware/Makefile --- linux-3.6.7/firmware/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/firmware/Makefile 2014-04-17 16:28:40.781625063 +0200 @@ -67,6 +67,11 @@ fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \ e100/d102e_ucode.bin +fw-shipped-$(CONFIG_MWL8K) += mwl8k/helper_8366.fw mwl8k/fmimage_8764_ap-2.fw \ + mwl8k/fmimage_8366_ap-4.fw + +fw-shipped-$(CONFIG_MWL8K_MFG) += mwl8k/mfg_fmimage_8764.fw mwl8k/mfg_fmimage_8366.fw + fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \ cis/DP83903.cis cis/NE2K.cis \ @@ -252,3 +257,10 @@ obj-n := dummy hostprogs-y := ihex2fw + +# hack for 'make mrproper' and mwl8k .fw files being removed. +quiet_cmd_shipped = SHIPPED $@ +cmd_shipped = cat $< > $@ + +%.fw: %.fw_shipped + $(call cmd,shipped) diff -ruw linux-3.6.7/fs/exec.c linux-3.6.7-fbx/fs/exec.c --- linux-3.6.7/fs/exec.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/exec.c 2014-04-17 16:28:41.273634540 +0200 @@ -66,6 +66,14 @@ #include +enum { + CORE_ENV_PID, + CORE_ENV_SIGNAL, + CORE_ENV_EXECUTABLE, + CORE_ENV_TIME, + CORE_ENV_NR, +}; + int core_uses_pid; char core_pattern[CORENAME_MAX_SIZE] = "core"; unsigned int core_pipe_limit; @@ -1477,6 +1485,23 @@ const struct cred *cred = current_cred(); /* + * handle current->exec_mode: + * - if unlimited, then nothing to do. + * - if once, then set it to denied and continue (next execve + * after this one will fail). + * - if denied, then effectively fail the execve call with EPERM. + */ + switch (current->exec_mode) { + case EXEC_MODE_UNLIMITED: + break; + case EXEC_MODE_ONCE: + current->exec_mode = EXEC_MODE_DENIED; + break; + case EXEC_MODE_DENIED: + return -EPERM; + } + + /* * We move the actual failure in case of RLIMIT_NPROC excess from * set*uid() to execve() because too many poorly written programs * don't check setuid() return code. Here we additionally recheck @@ -2104,8 +2129,10 @@ struct cred *cred; int retval = 0; int flag = 0; - int ispipe; + int ispipe, i; bool need_nonrelative = false; + char *helper_envp[CORE_ENV_NR + 1]; + static atomic_t core_dump_count = ATOMIC_INIT(0); struct coredump_params cprm = { .signr = signr, @@ -2119,6 +2146,7 @@ .mm_flags = mm->flags, }; + memset(helper_envp, 0, sizeof (helper_envp)); audit_core_dumps(signr); binfmt = mm->binfmt; @@ -2160,6 +2188,7 @@ if (ispipe) { int dump_count; char **helper_argv; + struct timeval tv; if (ispipe < 0) { printk(KERN_WARNING "format_corename failed\n"); @@ -2206,9 +2235,22 @@ goto fail_dropcount; } + /* Set pipe helper environment */ + do_gettimeofday(&tv); + + helper_envp[CORE_ENV_PID] = kasprintf(GFP_KERNEL, + "CORE_PID=%d", current->tgid); + helper_envp[CORE_ENV_SIGNAL] = kasprintf(GFP_KERNEL, + "CORE_SIGNAL=%ld", signr); + helper_envp[CORE_ENV_EXECUTABLE] = kasprintf(GFP_KERNEL, + "CORE_EXECUTABLE=%s", current->comm); + helper_envp[CORE_ENV_TIME] = kasprintf(GFP_KERNEL, + "CORE_TIME=%lu", tv.tv_sec); + helper_envp[CORE_ENV_NR] = NULL; + retval = call_usermodehelper_fns(helper_argv[0], helper_argv, - NULL, UMH_WAIT_EXEC, umh_pipe_setup, - NULL, &cprm); + helper_envp, UMH_WAIT_EXEC, + umh_pipe_setup, NULL, &cprm); argv_free(helper_argv); if (retval) { printk(KERN_INFO "Core dump to %s pipe failed\n", @@ -2274,6 +2316,9 @@ kfree(cn.corename); fail_corename: coredump_finish(mm); + for (i = 0; i < CORE_ENV_NR; i++) + kfree(helper_envp[i]); + revert_creds(old_cred); fail_creds: put_cred(cred); diff -ruw linux-3.6.7/fs/ext3/super.c linux-3.6.7-fbx/fs/ext3/super.c --- linux-3.6.7/fs/ext3/super.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/ext3/super.c 2014-04-17 16:28:41.309635234 +0200 @@ -353,7 +353,7 @@ return bdev; fail: - ext3_msg(sb, "error: failed to open journal device %s: %ld", + ext3_msg(sb, KERN_ERR, "error: failed to open journal device %s: %ld", __bdevname(dev, b), PTR_ERR(bdev)); return NULL; @@ -882,7 +882,7 @@ /*todo: use simple_strtoll with >32bit ext3 */ sb_block = simple_strtoul(options, &options, 0); if (*options && *options != ',') { - ext3_msg(sb, "error: invalid sb specification: %s", + ext3_msg(sb, KERN_ERR, "error: invalid sb specification: %s", (char *) *data); return 1; } diff -ruw linux-3.6.7/fs/ext4/inode.c linux-3.6.7-fbx/fs/ext4/inode.c --- linux-3.6.7/fs/ext4/inode.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/ext4/inode.c 2014-04-17 16:28:41.337635772 +0200 @@ -1501,6 +1501,8 @@ index = mpd->first_page; end = mpd->next_page - 1; + + pagevec_init(&pvec, 0); while (index <= end) { nr_pages = pagevec_lookup(&pvec, mapping, index, PAGEVEC_SIZE); if (nr_pages == 0) diff -ruw linux-3.6.7/fs/hfsplus/hfsplus_fs.h linux-3.6.7-fbx/fs/hfsplus/hfsplus_fs.h --- linux-3.6.7/fs/hfsplus/hfsplus_fs.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/hfsplus/hfsplus_fs.h 2014-04-17 16:28:41.437637699 +0200 @@ -166,6 +166,7 @@ #define HFSPLUS_SB_HFSX 3 #define HFSPLUS_SB_CASEFOLD 4 #define HFSPLUS_SB_NOBARRIER 5 +#define HFSPLUS_SB_NOOWNERS 6 static inline struct hfsplus_sb_info *HFSPLUS_SB(struct super_block *sb) { diff -ruw linux-3.6.7/fs/hfsplus/inode.c linux-3.6.7-fbx/fs/hfsplus/inode.c --- linux-3.6.7/fs/hfsplus/inode.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/hfsplus/inode.c 2014-04-17 16:28:41.437637699 +0200 @@ -234,11 +234,13 @@ mode = be16_to_cpu(perms->mode); inode->i_uid = be32_to_cpu(perms->owner); - if (!inode->i_uid && !mode) + if ((!inode->i_uid && !mode) || + test_bit(HFSPLUS_SB_NOOWNERS, &sbi->flags)) inode->i_uid = sbi->uid; inode->i_gid = be32_to_cpu(perms->group); - if (!inode->i_gid && !mode) + if ((!inode->i_gid && !mode) || + test_bit(HFSPLUS_SB_NOOWNERS, &sbi->flags)) inode->i_gid = sbi->gid; if (dir) { @@ -291,12 +293,16 @@ static int hfsplus_setattr(struct dentry *dentry, struct iattr *attr) { struct inode *inode = dentry->d_inode; + struct hfsplus_sb_info *sbi = HFSPLUS_SB(inode->i_sb); int error; error = inode_change_ok(inode, attr); if (error) return error; + if (test_bit(HFSPLUS_SB_NOOWNERS, &sbi->flags)) + attr->ia_valid &= ~(ATTR_UID | ATTR_GID); + if ((attr->ia_valid & ATTR_SIZE) && attr->ia_size != i_size_read(inode)) { inode_dio_wait(inode); @@ -390,8 +396,13 @@ inode->i_ino = sbi->next_cnid++; inode->i_mode = mode; + if (test_bit(HFSPLUS_SB_NOOWNERS, &sbi->flags)) { + inode->i_uid = sbi->uid; + inode->i_gid = sbi->gid; + } else { inode->i_uid = current_fsuid(); inode->i_gid = current_fsgid(); + } set_nlink(inode, 1); inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC; diff -ruw linux-3.6.7/fs/hfsplus/options.c linux-3.6.7-fbx/fs/hfsplus/options.c --- linux-3.6.7/fs/hfsplus/options.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/hfsplus/options.c 2014-04-17 16:28:41.437637699 +0200 @@ -24,7 +24,7 @@ opt_part, opt_session, opt_nls, opt_nodecompose, opt_decompose, opt_barrier, opt_nobarrier, - opt_force, opt_err + opt_force, opt_noowners, opt_err }; static const match_table_t tokens = { @@ -41,6 +41,7 @@ { opt_barrier, "barrier" }, { opt_nobarrier, "nobarrier" }, { opt_force, "force" }, + { opt_noowners, "noowners" }, { opt_err, NULL } }; @@ -188,6 +189,9 @@ case opt_force: set_bit(HFSPLUS_SB_FORCE, &sbi->flags); break; + case opt_noowners: + set_bit(HFSPLUS_SB_NOOWNERS, &sbi->flags); + break; default: return 0; } @@ -226,5 +230,7 @@ seq_printf(seq, ",nodecompose"); if (test_bit(HFSPLUS_SB_NOBARRIER, &sbi->flags)) seq_printf(seq, ",nobarrier"); + if (test_bit(HFSPLUS_SB_NOOWNERS, &sbi->flags)) + seq_printf(seq, ",noowners"); return 0; } diff -ruw linux-3.6.7/fs/Kconfig linux-3.6.7-fbx/fs/Kconfig --- linux-3.6.7/fs/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/Kconfig 2014-04-17 16:28:40.809625602 +0200 @@ -176,6 +176,17 @@ config HUGETLB_PAGE def_bool HUGETLBFS +config RAMFS_XATTR + bool + default n + +config RAMFS_XATTR_USER + bool "Enable user extended attributes on RAMFS filesystem" + select RAMFS_XATTR + help + Select this to enable extended user attributes on RAMFS + filesystem. + source "fs/configfs/Kconfig" endmenu diff -ruw linux-3.6.7/fs/namespace.c linux-3.6.7-fbx/fs/namespace.c --- linux-3.6.7/fs/namespace.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/namespace.c 2014-04-17 16:28:41.601640858 +0200 @@ -1588,7 +1588,7 @@ static int flags_to_propagation_type(int flags) { - int type = flags & ~(MS_REC | MS_SILENT); + int type = flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE); /* Fail if any non-propagation flags are set */ if (type & ~(MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE)) diff -ruw linux-3.6.7/fs/proc/array.c linux-3.6.7-fbx/fs/proc/array.c --- linux-3.6.7/fs/proc/array.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/proc/array.c 2014-04-17 16:28:41.945647484 +0200 @@ -159,6 +159,21 @@ return *p; } +static const char *const task_exec_mode_array[] = { + "0 (Denied)", + "1 (Once)", + "2 (Unlimited)", +}; + +static inline const char *get_task_exec_mode(struct task_struct *tsk) +{ + unsigned int exec_mode = tsk->exec_mode; + + if (exec_mode > EXEC_MODE_UNLIMITED) + return "? (Invalid)"; + return task_exec_mode_array[exec_mode]; +} + static inline void task_state(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *p) { @@ -336,6 +351,12 @@ p->nivcsw); } +static inline void task_exec_mode(struct seq_file *m, + struct task_struct *p) +{ + seq_printf(m, "Exec mode: %s\n", get_task_exec_mode(p)); +} + static void task_cpus_allowed(struct seq_file *m, struct task_struct *task) { seq_puts(m, "Cpus_allowed:\t"); @@ -363,6 +384,7 @@ task_cpus_allowed(m, task); cpuset_task_status_allowed(m, task); task_context_switch_counts(m, task); + task_exec_mode(m, task); return 0; } diff -ruw linux-3.6.7/fs/pstore/ram.c linux-3.6.7-fbx/fs/pstore/ram.c --- linux-3.6.7/fs/pstore/ram.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/pstore/ram.c 2014-04-17 16:28:41.993648409 +0200 @@ -374,9 +374,13 @@ goto fail_out; } + if (pdata->mem_size) pdata->mem_size = rounddown_pow_of_two(pdata->mem_size); + if (pdata->record_size) pdata->record_size = rounddown_pow_of_two(pdata->record_size); + if (pdata->console_size) pdata->console_size = rounddown_pow_of_two(pdata->console_size); + if (pdata->ftrace_size) pdata->ftrace_size = rounddown_pow_of_two(pdata->ftrace_size); cxt->dump_read_cnt = 0; diff -ruw linux-3.6.7/fs/ramfs/file-mmu.c linux-3.6.7-fbx/fs/ramfs/file-mmu.c --- linux-3.6.7/fs/ramfs/file-mmu.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/ramfs/file-mmu.c 2013-09-03 14:19:33.338105640 +0200 @@ -27,6 +27,7 @@ #include #include #include +#include #include "internal.h" @@ -52,4 +53,11 @@ const struct inode_operations ramfs_file_inode_operations = { .setattr = simple_setattr, .getattr = simple_getattr, +#ifdef CONFIG_RAMFS_XATTR + .setxattr = generic_setxattr, + .getxattr = generic_getxattr, + .listxattr = generic_listxattr, + .removexattr = generic_removexattr, +#endif }; + diff -ruw linux-3.6.7/fs/ramfs/inode.c linux-3.6.7-fbx/fs/ramfs/inode.c --- linux-3.6.7/fs/ramfs/inode.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/ramfs/inode.c 2014-04-17 16:28:41.997648486 +0200 @@ -36,12 +36,14 @@ #include #include #include +#include #include "internal.h" #define RAMFS_DEFAULT_MODE 0755 static const struct super_operations ramfs_ops; static const struct inode_operations ramfs_dir_inode_operations; +static struct kmem_cache *ramfs_inode_cache; static struct backing_dev_info ramfs_backing_dev_info = { .name = "ramfs", @@ -51,6 +53,28 @@ BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP, }; +static struct inode *ramfs_alloc_inode(struct super_block *sb) +{ + struct ramfs_inode_info *rii; + + rii = kmem_cache_alloc(ramfs_inode_cache, GFP_KERNEL); + if (!rii) + return NULL; + return &rii->vfs_inode; +} + +static void ramfs_destroy_inode(struct inode *ino) +{ + struct ramfs_inode_info *rii; + + rii = RAMFS_I(ino); + +#ifdef CONFIG_RAMFS_XATTR + ramfs_inode_purge_xattrs(rii); +#endif + kmem_cache_free(ramfs_inode_cache, rii); +} + struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir, umode_t mode, dev_t dev) { @@ -148,9 +172,17 @@ .rmdir = simple_rmdir, .mknod = ramfs_mknod, .rename = simple_rename, +#ifdef CONFIG_RAMFS_XATTR + .setxattr = generic_setxattr, + .getxattr = generic_getxattr, + .listxattr = generic_listxattr, + .removexattr = generic_removexattr, +#endif }; static const struct super_operations ramfs_ops = { + .alloc_inode = ramfs_alloc_inode, + .destroy_inode = ramfs_destroy_inode, .statfs = simple_statfs, .drop_inode = generic_delete_inode, .show_options = generic_show_options, @@ -229,6 +261,9 @@ sb->s_magic = RAMFS_MAGIC; sb->s_op = &ramfs_ops; sb->s_time_gran = 1; +#ifdef CONFIG_RAMFS_XATTR + sb->s_xattr = ramfs_xattr_handlers; +#endif inode = ramfs_get_inode(sb, NULL, S_IFDIR | fsi->mount_opts.mode, 0); sb->s_root = d_make_root(inode); @@ -267,6 +302,16 @@ .kill_sb = kill_litter_super, }; +static void ramfs_inode_init_once(void *ptr) +{ + struct ramfs_inode_info *p = (struct ramfs_inode_info *)ptr; + + inode_init_once(&p->vfs_inode); +#ifdef CONFIG_RAMFS_XATTR_USER + INIT_LIST_HEAD(&p->xattr_user_list); +#endif +} + static int __init init_ramfs_fs(void) { return register_filesystem(&ramfs_fs_type); @@ -281,9 +326,18 @@ if (err) return err; - err = register_filesystem(&rootfs_fs_type); - if (err) + ramfs_inode_cache = kmem_cache_create("ramfs_inode_cache", + sizeof (struct ramfs_inode_info), + 0, 0, ramfs_inode_init_once); + if (!ramfs_inode_cache) { bdi_destroy(&ramfs_backing_dev_info); + return -ENOMEM; + } + err = register_filesystem(&rootfs_fs_type); + if (err) { + kmem_cache_destroy(ramfs_inode_cache); + bdi_destroy(&ramfs_backing_dev_info); + } return err; } diff -ruw linux-3.6.7/fs/ramfs/internal.h linux-3.6.7-fbx/fs/ramfs/internal.h --- linux-3.6.7/fs/ramfs/internal.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/ramfs/internal.h 2013-09-03 14:19:33.338105640 +0200 @@ -9,6 +9,42 @@ * 2 of the License, or (at your option) any later version. */ +#ifndef RAMFS_INTERNAL_H +# define RAMFS_INTERNAL_H + +/* need list_head */ +#include extern const struct address_space_operations ramfs_aops; extern const struct inode_operations ramfs_file_inode_operations; + + +struct ramfs_xattr +{ + char *name; + void *data; + size_t data_len; + + struct list_head list; +}; + +struct ramfs_inode_info +{ + struct inode vfs_inode; +#ifdef CONFIG_RAMFS_XATTR_USER + struct list_head xattr_user_list; +#endif +}; + +static inline struct ramfs_inode_info *RAMFS_I(struct inode *inode) +{ + return container_of(inode, struct ramfs_inode_info, vfs_inode); +} + +#ifdef CONFIG_RAMFS_XATTR +void ramfs_inode_purge_xattrs(struct ramfs_inode_info *rii); +extern const struct xattr_handler *ramfs_xattr_handlers[]; +#endif + + +#endif /* !RAMFS_INTERNAL_H */ diff -ruw linux-3.6.7/fs/ramfs/Makefile linux-3.6.7-fbx/fs/ramfs/Makefile --- linux-3.6.7/fs/ramfs/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/ramfs/Makefile 2013-09-03 14:19:33.338105640 +0200 @@ -6,4 +6,5 @@ file-mmu-y := file-nommu.o file-mmu-$(CONFIG_MMU) := file-mmu.o -ramfs-objs += inode.o $(file-mmu-y) +ramfs-xattr-$(CONFIG_RAMFS_XATTR) += xattr.o +ramfs-objs += inode.o $(file-mmu-y) $(ramfs-xattr-y) diff -ruw linux-3.6.7/fs/xfs/xfs_buf.c linux-3.6.7-fbx/fs/xfs/xfs_buf.c --- linux-3.6.7/fs/xfs/xfs_buf.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/xfs/xfs_buf.c 2014-04-17 16:28:42.125650951 +0200 @@ -431,6 +431,37 @@ return error; } +#ifdef CONFIG_MIPS +static void cache_flush_buf_page(xfs_buf_t *bp, int page_id) +{ + struct page *page; + void *vmaddr, *addr; + + if (!xfs_buf_is_vmapped(bp)) + return; + + page = bp->b_pages[page_id]; + vmaddr = bp->b_addr - bp->b_offset + (page_id * PAGE_CACHE_SIZE); + addr = page_address(page); + + if (pages_do_alias((unsigned long)addr, (unsigned long)vmaddr)) { + local_flush_data_cache_page(vmaddr); + local_flush_data_cache_page(addr); + } +} + +static void cache_flush_buf(xfs_buf_t *bp) +{ + unsigned int i; + + for (i = 0; i < bp->b_page_count; i++) + cache_flush_buf_page(bp, i); +} +#else +static inline void cache_flush_buf_page(xfs_buf_t *bp, int page_id) { } +static inline void cache_flush_buf(xfs_buf_t *bp) { } +#endif + /* * Map buffer into kernel address-space if necessary. */ @@ -459,6 +490,7 @@ if (!bp->b_addr) return -ENOMEM; bp->b_addr += bp->b_offset; + cache_flush_buf(bp); } return 0; @@ -487,6 +519,7 @@ struct rb_node *parent; xfs_buf_t *bp; xfs_daddr_t blkno = map[0].bm_bn; + xfs_daddr_t eofs; int numblks = 0; int i; @@ -498,6 +531,23 @@ ASSERT(!(numbytes < (1 << btp->bt_sshift))); ASSERT(!(BBTOB(blkno) & (xfs_off_t)btp->bt_smask)); + /* + * Corrupted block numbers can get through to here, unfortunately, so we + * have to check that the buffer falls within the filesystem bounds. + */ + eofs = XFS_FSB_TO_BB(btp->bt_mount, btp->bt_mount->m_sb.sb_dblocks); + if (blkno >= eofs) { + /* + * XXX (dgc): we should really be returning EFSCORRUPTED here, + * but none of the higher level infrastructure supports + * returning a specific error on buffer lookup failures. + */ + xfs_alert(btp->bt_mount, + "%s: Block out of range: block 0x%llx, EOFS 0x%llx ", + __func__, blkno, eofs); + return NULL; + } + /* get tree root */ pag = xfs_perag_get(btp->bt_mount, xfs_daddr_to_agno(btp->bt_mount, blkno)); @@ -1259,6 +1309,7 @@ if (nbytes > size) nbytes = size; + cache_flush_buf_page(bp, page_index); rbytes = bio_add_page(bio, bp->b_pages[page_index], nbytes, offset); if (rbytes < nbytes) diff -ruw linux-3.6.7/fs/xfs/xfs_dir2_block.c linux-3.6.7-fbx/fs/xfs/xfs_dir2_block.c --- linux-3.6.7/fs/xfs/xfs_dir2_block.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/xfs/xfs_dir2_block.c 2014-04-17 16:28:42.125650951 +0200 @@ -481,6 +481,9 @@ * Each object is a real entry (dep) or an unused one (dup). */ while (ptr < endptr) { + struct xfs_inode *inode; + unsigned int type; + dup = (xfs_dir2_data_unused_t *)ptr; /* * Unused, skip it. @@ -505,12 +508,20 @@ cook = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk, (char *)dep - (char *)hdr); + if (xfs_iget(mp, NULL, be64_to_cpu(dep->inumber), 0, 0, + &inode) == 0) { + type = (inode->i_d.di_mode >> 12) & 0xf; + xfs_iunlock(inode, 0); + IRELE(inode); + } else + type = DT_UNKNOWN; + /* * If it didn't fit, set the final offset to here & return. */ if (filldir(dirent, (char *)dep->name, dep->namelen, cook & 0x7fffffff, be64_to_cpu(dep->inumber), - DT_UNKNOWN)) { + type)) { *offset = cook & 0x7fffffff; xfs_trans_brelse(NULL, bp); return 0; diff -ruw linux-3.6.7/fs/xfs/xfs_dir2_leaf.c linux-3.6.7-fbx/fs/xfs/xfs_dir2_leaf.c --- linux-3.6.7/fs/xfs/xfs_dir2_leaf.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/xfs/xfs_dir2_leaf.c 2014-04-17 16:28:42.129651029 +0200 @@ -1035,6 +1035,9 @@ * Get more blocks and readahead as necessary. */ while (curoff < XFS_DIR2_LEAF_OFFSET) { + struct xfs_inode *inode; + unsigned int type; + /* * If we have no buffer, or we're off the end of the * current buffer, need to get another one. @@ -1122,9 +1125,17 @@ dep = (xfs_dir2_data_entry_t *)ptr; length = xfs_dir2_data_entsize(dep->namelen); + if (xfs_iget(mp, NULL, be64_to_cpu(dep->inumber), 0, 0, + &inode) == 0) { + type = (inode->i_d.di_mode >> 12) & 0xf; + xfs_iunlock(inode, 0); + IRELE(inode); + } else + type = DT_UNKNOWN; + if (filldir(dirent, (char *)dep->name, dep->namelen, xfs_dir2_byte_to_dataptr(mp, curoff) & 0x7fffffff, - be64_to_cpu(dep->inumber), DT_UNKNOWN)) + be64_to_cpu(dep->inumber), type)) break; /* diff -ruw linux-3.6.7/fs/xfs/xfs_dir2_sf.c linux-3.6.7-fbx/fs/xfs/xfs_dir2_sf.c --- linux-3.6.7/fs/xfs/xfs_dir2_sf.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/fs/xfs/xfs_dir2_sf.c 2014-04-17 16:28:42.133651105 +0200 @@ -842,6 +842,9 @@ */ sfep = xfs_dir2_sf_firstentry(sfp); for (i = 0; i < sfp->count; i++) { + struct xfs_inode *inode; + unsigned int type; + off = xfs_dir2_db_off_to_dataptr(mp, mp->m_dirdatablk, xfs_dir2_sf_get_offset(sfep)); @@ -851,8 +854,16 @@ } ino = xfs_dir2_sfe_get_ino(sfp, sfep); + + if (xfs_iget(mp, NULL, ino, 0, 0, &inode) == 0) { + type = (inode->i_d.di_mode >> 12) & 0xf; + xfs_iunlock(inode, 0); + IRELE(inode); + } else + type = DT_UNKNOWN; + if (filldir(dirent, (char *)sfep->name, sfep->namelen, - off & 0x7fffffff, ino, DT_UNKNOWN)) { + off & 0x7fffffff, ino, type)) { *offset = off & 0x7fffffff; return 0; } diff -ruw linux-3.6.7/include/asm-generic/socket.h linux-3.6.7-fbx/include/asm-generic/socket.h --- linux-3.6.7/include/asm-generic/socket.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/asm-generic/socket.h 2014-04-17 16:28:42.257653494 +0200 @@ -72,4 +72,6 @@ /* Instruct lower device to use last 4-bytes of skb data as FCS */ #define SO_NOFCS 43 +#define SO_UDP_DUP_UNICAST 44 + #endif /* __ASM_GENERIC_SOCKET_H */ diff -ruw linux-3.6.7/include/linux/ethtool.h linux-3.6.7-fbx/include/linux/ethtool.h --- linux-3.6.7/include/linux/ethtool.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/ethtool.h 2014-04-17 16:28:42.449657192 +0200 @@ -501,10 +501,12 @@ struct ethtool_ah_espip4_spec esp_ip4_spec; struct ethtool_usrip4_spec usr_ip4_spec; struct ethhdr ether_spec; - __u8 hdata[60]; + __u8 hdata[52]; }; struct ethtool_flow_ext { + __u8 padding[2]; + unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ __be16 vlan_etype; __be16 vlan_tci; __be32 data[2]; @@ -1262,6 +1264,8 @@ #define ETHER_FLOW 0x12 /* spec only (ether_spec) */ /* Flag to enable additional fields in struct ethtool_rx_flow_spec */ #define FLOW_EXT 0x80000000 +#define FLOW_MAC_EXT 0x40000000 + /* L3-L4 network traffic flow hash options */ #define RXH_L2DA (1 << 1) diff -ruw linux-3.6.7/include/linux/filter.h linux-3.6.7-fbx/include/linux/filter.h --- linux-3.6.7/include/linux/filter.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/filter.h 2014-04-17 16:28:42.469657578 +0200 @@ -74,6 +74,8 @@ #define BPF_LSH 0x60 #define BPF_RSH 0x70 #define BPF_NEG 0x80 +#define BPF_XOR 0xa0 + #define BPF_JA 0x00 #define BPF_JEQ 0x10 #define BPF_JGT 0x20 @@ -200,6 +202,8 @@ BPF_S_ALU_AND_X, BPF_S_ALU_OR_K, BPF_S_ALU_OR_X, + BPF_S_ALU_XOR_K, + BPF_S_ALU_XOR_X, BPF_S_ALU_LSH_K, BPF_S_ALU_LSH_X, BPF_S_ALU_RSH_K, diff -ruw linux-3.6.7/include/linux/fsl_devices.h linux-3.6.7-fbx/include/linux/fsl_devices.h --- linux-3.6.7/include/linux/fsl_devices.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/fsl_devices.h 2014-04-17 16:28:42.473657655 +0200 @@ -24,6 +24,7 @@ #define FSL_USB_VER_2_2 2 #include +#include /* * Some conventions on how we handle peripherals on Freescale chips @@ -102,6 +103,8 @@ u32 pm_configured_flag; u32 pm_portsc; u32 pm_usbgenctrl; + + struct mbus_dram_target_info *dram; }; /* Flags in fsl_usb2_mph_platform_data */ diff -ruw linux-3.6.7/include/linux/if_tunnel.h linux-3.6.7-fbx/include/linux/if_tunnel.h --- linux-3.6.7/include/linux/if_tunnel.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/if_tunnel.h 2014-04-17 16:28:42.521658579 +0200 @@ -38,6 +38,11 @@ __be16 o_flags; __be32 i_key; __be32 o_key; + + /* this is the first bits to match on ipv6 address */ + struct in6_addr fbx6to4_zone; + __u8 fbx6to4_prefix; + struct iphdr iph; }; diff -ruw linux-3.6.7/include/linux/if_vlan.h linux-3.6.7-fbx/include/linux/if_vlan.h --- linux-3.6.7/include/linux/if_vlan.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/if_vlan.h 2014-04-17 16:28:42.521658579 +0200 @@ -91,8 +91,10 @@ extern struct net_device *__vlan_find_dev_deep(struct net_device *real_dev, u16 vlan_id); extern struct net_device *vlan_dev_real_dev(const struct net_device *dev); +extern struct net_device *vlan_dev_upper_dev(const struct net_device *dev); extern u16 vlan_dev_vlan_id(const struct net_device *dev); + extern bool vlan_do_receive(struct sk_buff **skb); extern struct sk_buff *vlan_untag(struct sk_buff *skb); @@ -114,6 +116,12 @@ { BUG(); return NULL; +} + +static inline struct net_device *vlan_dev_upper_dev(const struct net_device *dev) +{ + BUG(); + return NULL; } static inline u16 vlan_dev_vlan_id(const struct net_device *dev) diff -ruw linux-3.6.7/include/linux/in.h linux-3.6.7-fbx/include/linux/in.h --- linux-3.6.7/include/linux/in.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/in.h 2014-04-17 16:28:42.521658579 +0200 @@ -265,6 +265,9 @@ return 0; case IPPROTO_AH: /* SPI */ return 4; + case IPPROTO_IPV6: + /* third byte of ipv6 destination address */ + return 36; default: return -EINVAL; } diff -ruw linux-3.6.7/include/linux/init_task.h linux-3.6.7-fbx/include/linux/init_task.h --- linux-3.6.7/include/linux/init_task.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/init_task.h 2014-04-17 16:28:42.521658579 +0200 @@ -153,6 +153,7 @@ .stack = &init_thread_info, \ .usage = ATOMIC_INIT(2), \ .flags = PF_KTHREAD, \ + .exec_mode = EXEC_MODE_UNLIMITED, \ .prio = MAX_PRIO-20, \ .static_prio = MAX_PRIO-20, \ .normal_prio = MAX_PRIO-20, \ diff -ruw linux-3.6.7/include/linux/Kbuild linux-3.6.7-fbx/include/linux/Kbuild --- linux-3.6.7/include/linux/Kbuild 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/Kbuild 2014-04-17 16:28:42.297654265 +0200 @@ -126,6 +126,10 @@ header-y += fanotify.h header-y += fb.h header-y += fcntl.h +header-y += fbxatm.h +header-y += fbxjtag.h +header-y += fbxbridge.h +header-y += fbxmtd_map_ioctl.h header-y += fd.h header-y += fdreg.h header-y += fib_rules.h @@ -413,3 +417,5 @@ header-y += x25.h header-y += xattr.h header-y += xfrm.h +header-y += remoti/ +header-y += hdmi-cec/ diff -ruw linux-3.6.7/include/linux/major.h linux-3.6.7-fbx/include/linux/major.h --- linux-3.6.7/include/linux/major.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/major.h 2014-04-17 16:28:42.581659735 +0200 @@ -171,7 +171,16 @@ #define VIOTAPE_MAJOR 230 -#define BLOCK_EXT_MAJOR 259 +/* + * Until userland gets decent support for large majors number (if the + * day ever comes), use 242 for BLOCK_EXT_MAJOR. According to + * devices.txt area 240 to 254 is assigned for "LOCAL/EXPERIMENTAL + * USE". This kind of hack would fall in this category. + */ +/* #define BLOCK_EXT_MAJOR 259 */ +#define BLOCK_EXT_MAJOR 242 + + #define SCSI_OSD_MAJOR 260 /* open-osd's OSD scsi device */ #endif diff -ruw linux-3.6.7/include/linux/mtd/mtd.h linux-3.6.7-fbx/include/linux/mtd/mtd.h --- linux-3.6.7/include/linux/mtd/mtd.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/mtd/mtd.h 2014-04-17 16:28:42.637660814 +0200 @@ -166,6 +166,11 @@ */ unsigned int bitflip_threshold; + /* NAND related attributes */ + const char *nand_type; + const char *nand_manufacturer; + const char *onfi_version; + // Kernel-only stuff starts here. const char *name; int index; diff -ruw linux-3.6.7/include/linux/mtd/nand.h linux-3.6.7-fbx/include/linux/mtd/nand.h --- linux-3.6.7/include/linux/mtd/nand.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/mtd/nand.h 2014-04-17 16:28:42.637660814 +0200 @@ -210,7 +210,8 @@ #define NAND_HAS_COPYBACK(chip) ((chip->options & NAND_COPYBACK)) /* Large page NAND with SOFT_ECC should support subpage reads */ #define NAND_SUBPAGE_READ(chip) ((chip->ecc.mode == NAND_ECC_SOFT) \ - && (chip->page_shift > 9)) + && (chip->page_shift > 9) \ + && !(chip->options & NAND_NO_RNDOUT)) /* Non chip related options */ /* This option skips the bbt scan during initialization. */ @@ -223,6 +224,10 @@ /* Chip may not exist, so silence any errors in scan */ #define NAND_SCAN_SILENT_NODEV 0x00040000 + +/* NAND controller does not want RNDOUT commands, even in NAND_ECC_SOFT */ +#define NAND_NO_RNDOUT 0x00800000 + /* Options set by nand scan */ /* Nand scan has allocated controller struct */ #define NAND_CONTROLLER_ALLOC 0x80000000 diff -ruw linux-3.6.7/include/linux/mv643xx_eth.h linux-3.6.7-fbx/include/linux/mv643xx_eth.h --- linux-3.6.7/include/linux/mv643xx_eth.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/mv643xx_eth.h 2014-04-17 16:28:42.681661662 +0200 @@ -6,6 +6,7 @@ #define __LINUX_MV643XX_ETH_H #include +#include #define MV643XX_ETH_SHARED_NAME "mv643xx_eth" #define MV643XX_ETH_NAME "mv643xx_eth_port" @@ -44,6 +45,15 @@ int phy_addr; /* + * if PHY_NONE, called at probe/remove time to configure mii bus + */ + int (*mii_config)(struct net_device *dev, int probe, + int (*mii_read)(struct net_device *dev, + int phy_id, int reg), + void (*mii_write)(struct net_device *dev, + int phy_id, int reg, int val)); + + /* * Use this MAC address if it is valid, overriding the * address that is already in the hardware. */ diff -ruw linux-3.6.7/include/linux/netdevice.h linux-3.6.7-fbx/include/linux/netdevice.h --- linux-3.6.7/include/linux/netdevice.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/netdevice.h 2014-04-17 17:00:38.218938071 +0200 @@ -1290,6 +1290,11 @@ /* GARP */ struct garp_port __rcu *garp_port; +#if defined(CONFIG_FBXBRIDGE) || defined(CONFIG_FBXBRIDGE_MODULE) + struct fbxbridge *fbx_bridge; + struct fbxbridge *fbx_bridge_port; +#endif + /* class/net/name entry */ struct device dev; /* space for optional device, statistics, and wireless sysfs groups */ diff -ruw linux-3.6.7/include/linux/netfilter/nf_conntrack_ftp.h linux-3.6.7-fbx/include/linux/netfilter/nf_conntrack_ftp.h --- linux-3.6.7/include/linux/netfilter/nf_conntrack_ftp.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/netfilter/nf_conntrack_ftp.h 2014-04-17 16:28:42.693661892 +0200 @@ -25,6 +25,11 @@ u_int32_t seq_aft_nl[IP_CT_DIR_MAX][NUM_SEQ_TO_REMEMBER]; /* 0 means seq_match_aft_nl not set */ int seq_aft_nl_num[IP_CT_DIR_MAX]; +#if defined(CONFIG_FREEBOX_BRIDGE) || defined(CONFIG_FREEBOX_BRIDGE_MODULE) + unsigned int is_fbxbridge; + unsigned long fbxbridge_remote; + unsigned long fbxbridge_wan; +#endif }; struct nf_conntrack_expect; diff -ruw linux-3.6.7/include/linux/pci_ids.h linux-3.6.7-fbx/include/linux/pci_ids.h --- linux-3.6.7/include/linux/pci_ids.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/pci_ids.h 2014-04-17 16:28:42.745662894 +0200 @@ -2917,3 +2917,6 @@ #define PCI_DEVICE_ID_XEN_PLATFORM 0x0001 #define PCI_VENDOR_ID_OCZ 0x1b85 + +#define PCI_VENDOR_ID_PERICOM 0x12d8 +#define PCI_DEVICE_ID_PI7C9X20303SL 0xa303 diff -ruw linux-3.6.7/include/linux/ppp_channel.h linux-3.6.7-fbx/include/linux/ppp_channel.h --- linux-3.6.7/include/linux/ppp_channel.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/ppp_channel.h 2013-09-03 14:19:33.354105946 +0200 @@ -49,6 +49,9 @@ /* Called by the channel when it can send some more data. */ extern void ppp_output_wakeup(struct ppp_channel *); +/* Called by the channel when it want to prevent further transmit on it */ +extern void ppp_output_stop(struct ppp_channel *); + /* Called by the channel to process a received PPP packet. The packet should have just the 2-byte PPP protocol header. */ extern void ppp_input(struct ppp_channel *, struct sk_buff *); diff -ruw linux-3.6.7/include/linux/prctl.h linux-3.6.7-fbx/include/linux/prctl.h --- linux-3.6.7/include/linux/prctl.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/prctl.h 2014-04-17 16:28:42.769663357 +0200 @@ -149,4 +149,22 @@ #define PR_GET_TID_ADDRESS 40 +#define PR_SET_JAIL 41 +#define PR_GET_JAIL 42 +#define PR_JAIL_EXEC_ALL 0x0 +#define PR_JAIL_EXEC_ONCE 0x1 +#define PR_JAIL_EXEC_NO 0x2 + +#define PR_SET_JAIL_ENTRIES 43 + +#define PR_ADD_JAIL_FILES 44 +#define PR_JAIL_FILE_READ 0x1 +#define PR_JAIL_FILE_WRITE 0x2 + +/* + * Freebox addition: set/get exec mode. + */ +#define PR_SET_EXEC_MODE 45 +#define PR_GET_EXEC_MODE 46 + #endif /* _LINUX_PRCTL_H */ diff -ruw linux-3.6.7/include/linux/sched.h linux-3.6.7-fbx/include/linux/sched.h --- linux-3.6.7/include/linux/sched.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/sched.h 2014-04-17 16:28:42.805664050 +0200 @@ -1231,6 +1231,12 @@ perf_nr_task_contexts, }; +enum task_exec_mode { + EXEC_MODE_DENIED, + EXEC_MODE_ONCE, + EXEC_MODE_UNLIMITED, +}; + struct task_struct { volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ void *stack; @@ -1238,6 +1244,8 @@ unsigned int flags; /* per process flags, defined below */ unsigned int ptrace; + enum task_exec_mode exec_mode; + #ifdef CONFIG_SMP struct llist_node wake_entry; int on_cpu; @@ -1421,6 +1429,7 @@ unsigned int sessionid; #endif struct seccomp seccomp; + struct fbxlsmjail *fbxjail; /* Thread group tracking */ u32 parent_exec_id; @@ -2684,7 +2693,16 @@ extern void recalc_sigpending_and_wake(struct task_struct *t); extern void recalc_sigpending(void); -extern void signal_wake_up(struct task_struct *t, int resume_stopped); +extern void signal_wake_up_state(struct task_struct *t, unsigned int state); + +static inline void signal_wake_up(struct task_struct *t, bool resume) +{ + signal_wake_up_state(t, resume ? TASK_WAKEKILL : 0); +} +static inline void ptrace_signal_wake_up(struct task_struct *t, bool resume) +{ + signal_wake_up_state(t, resume ? __TASK_TRACED : 0); +} /* * Wrappers for p->thread_info->cpu access. No-op on UP. diff -ruw linux-3.6.7/include/linux/seccomp.h linux-3.6.7-fbx/include/linux/seccomp.h --- linux-3.6.7/include/linux/seccomp.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/seccomp.h 2014-04-17 16:28:42.805664050 +0200 @@ -48,6 +48,7 @@ #ifdef CONFIG_SECCOMP #include +#include #include struct seccomp_filter; @@ -89,6 +90,44 @@ return s->mode; } +/** + * struct seccomp_filter - container for seccomp BPF programs + * + * @usage: reference count to manage the object lifetime. + * get/put helpers should be used when accessing an instance + * outside of a lifetime-guarded section. In general, this + * is only needed for handling filters shared across tasks. + * @prev: points to a previously installed, or inherited, filter + * @len: the number of instructions in the program + * @insns: the BPF program instructions to evaluate + * + * seccomp_filter objects are organized in a tree linked via the @prev + * pointer. For any task, it appears to be a singly-linked list starting + * with current->seccomp.filter, the most recently attached or inherited filter. + * However, multiple filters may share a @prev node, by way of fork(), which + * results in a unidirectional tree existing in memory. This is similar to + * how namespaces work. + * + * seccomp_filter objects should never be modified after being attached + * to a task_struct (other than @usage). + */ +struct seccomp_filter { + atomic_t usage; + struct seccomp_filter *prev; + unsigned short len; /* Instruction count */ + unsigned int (*bpf_func)(const struct sk_buff *skb, + const struct sock_filter *filter); + struct sock_filter insns[]; +}; + +#ifdef CONFIG_SECCOMP_FILTER_JIT +extern void seccomp_jit_compile(struct seccomp_filter *fp); +extern void seccomp_jit_free(struct seccomp_filter *fp); +#else +static inline void seccomp_jit_compile(struct seccomp_filter *fp) { } +static inline void seccomp_jit_free(struct seccomp_filter *fp) { } +#endif + #else /* CONFIG_SECCOMP */ #include diff -ruw linux-3.6.7/include/linux/serial_reg.h linux-3.6.7-fbx/include/linux/serial_reg.h --- linux-3.6.7/include/linux/serial_reg.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/serial_reg.h 2014-04-17 16:28:42.817664281 +0200 @@ -18,9 +18,18 @@ * DLAB=0 */ #define UART_RX 0 /* In: Receive buffer */ +#ifdef CONFIG_TANGO2 +#define UART_TX 1 /* Out: Transmit buffer */ +#else #define UART_TX 0 /* Out: Transmit buffer */ +#endif +#ifdef CONFIG_TANGO2 +#define UART_IER 2 /* Out: Interrupt Enable Register */ +#else #define UART_IER 1 /* Out: Interrupt Enable Register */ +#endif + #define UART_IER_MSI 0x08 /* Enable Modem status interrupt */ #define UART_IER_RLSI 0x04 /* Enable receiver line status interrupt */ #define UART_IER_THRI 0x02 /* Enable Transmitter holding register int. */ @@ -30,7 +39,12 @@ */ #define UART_IERX_SLEEP 0x10 /* Enable sleep mode */ +#ifdef CONFIG_TANGO2 +#define UART_IIR 3 /* In: Interrupt ID Register */ +#else #define UART_IIR 2 /* In: Interrupt ID Register */ +#endif + #define UART_IIR_NO_INT 0x01 /* No interrupts pending */ #define UART_IIR_ID 0x06 /* Mask for the interrupt ID */ #define UART_IIR_MSI 0x00 /* Modem status interrupt */ @@ -40,7 +54,12 @@ #define UART_IIR_BUSY 0x07 /* DesignWare APB Busy Detect */ +#ifdef CONFIG_TANGO2 +#define UART_FCR 4 /* Out: FIFO Control Register */ +#else #define UART_FCR 2 /* Out: FIFO Control Register */ +#endif + #define UART_FCR_ENABLE_FIFO 0x01 /* Enable the FIFO */ #define UART_FCR_CLEAR_RCVR 0x02 /* Clear the RCVR FIFO */ #define UART_FCR_CLEAR_XMIT 0x04 /* Clear the XMIT FIFO */ @@ -84,7 +103,12 @@ #define UART_FCR6_T_TRIGGER_30 0x30 /* Mask for transmit trigger set at 30 */ #define UART_FCR7_64BYTE 0x20 /* Go into 64 byte mode (TI16C750) */ +#ifdef CONFIG_TANGO2 +#define UART_LCR 5 /* Out: Line Control Register */ +#else #define UART_LCR 3 /* Out: Line Control Register */ +#endif + /* * Note: if the word length is 5 bits (UART_LCR_WLEN5), then setting * UART_LCR_STOP will select 1.5 stop bits, not 2 stop bits. @@ -107,7 +131,11 @@ #define UART_LCR_CONF_MODE_A UART_LCR_DLAB /* Configutation mode A */ #define UART_LCR_CONF_MODE_B 0xBF /* Configutation mode B */ +#ifdef CONFIG_TANGO2 +#define UART_MCR 6 /* Out: Modem Control Register */ +#else #define UART_MCR 4 /* Out: Modem Control Register */ +#endif #define UART_MCR_CLKSEL 0x80 /* Divide clock by 4 (TI16C752, EFR[4]=1) */ #define UART_MCR_TCRTLR 0x40 /* Access TCR/TLR (TI16C752, EFR[4]=1) */ #define UART_MCR_XONANY 0x20 /* Enable Xon Any (TI16C752, EFR[4]=1) */ @@ -118,8 +146,14 @@ #define UART_MCR_RTS 0x02 /* RTS complement */ #define UART_MCR_DTR 0x01 /* DTR complement */ +#ifdef CONFIG_TANGO2 +#define UART_LSR 7 /* In: Line Status Register */ +#else #define UART_LSR 5 /* In: Line Status Register */ +#endif + #define UART_LSR_FIFOE 0x80 /* Fifo error */ + #define UART_LSR_TEMT 0x40 /* Transmitter empty */ #define UART_LSR_THRE 0x20 /* Transmit-hold-register empty */ #define UART_LSR_BI 0x10 /* Break interrupt indicator */ @@ -129,7 +163,11 @@ #define UART_LSR_DR 0x01 /* Receiver data ready */ #define UART_LSR_BRK_ERROR_BITS 0x1E /* BI, FE, PE, OE bits */ +#ifdef CONFIG_TANGO2 +#define UART_MSR 8 /* In: Modem Status Register */ +#else #define UART_MSR 6 /* In: Modem Status Register */ +#endif #define UART_MSR_DCD 0x80 /* Data Carrier Detect */ #define UART_MSR_RI 0x40 /* Ring Indicator */ #define UART_MSR_DSR 0x20 /* Data Set Ready */ @@ -140,18 +178,37 @@ #define UART_MSR_DCTS 0x01 /* Delta CTS */ #define UART_MSR_ANY_DELTA 0x0F /* Any of the delta bits! */ +#ifdef CONFIG_TANGO2 +#define UART_SCR 9 /* I/O: Scratch Register */ +#else #define UART_SCR 7 /* I/O: Scratch Register */ +#endif /* * DLAB=1 */ +#ifdef CONFIG_TANGO2 +/* + * smp863x has DLM and DLM in one register + */ +#define UART_DL 10 +#define UART_CLKSEL 11 /* Clock selection */ +#else #define UART_DLL 0 /* Out: Divisor Latch Low */ #define UART_DLM 1 /* Out: Divisor Latch High */ +#endif /* * LCR=0xBF (or DLAB=1 for 16C660) */ +#ifdef CONFIG_TANGO2 +/* EFR does not exist on TANGO2, we use a magic to catch accesses and + * make them nop */ +#define UART_EFR 42 +#else #define UART_EFR 2 /* I/O: Extended Features Register */ +#endif + #define UART_XR_EFR 9 /* I/O: Extended Features Register (XR17D15x) */ #define UART_EFR_CTS 0x80 /* CTS flow control */ #define UART_EFR_RTS 0x40 /* RTS flow control */ diff -ruw linux-3.6.7/include/linux/skbuff.h linux-3.6.7-fbx/include/linux/skbuff.h --- linux-3.6.7/include/linux/skbuff.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/skbuff.h 2014-04-17 17:00:38.218938071 +0200 @@ -322,6 +322,13 @@ #define NET_SKBUFF_NF_DEFRAG_NEEDED 1 #endif +enum { + FFN_STATE_INIT = 0, + FFN_STATE_FORWARDABLE, + FFN_STATE_FAST_FORWARDED, + FFN_STATE_INCOMPATIBLE, +}; + /** * struct sk_buff - socket buffer * @next: Next buffer in list @@ -439,6 +446,10 @@ #endif #ifdef NET_SKBUFF_NF_DEFRAG_NEEDED struct sk_buff *nfct_reasm; +#ifdef CONFIG_IP_FFN + int ffn_state; + int ffn_orig_tos; +#endif #endif #ifdef CONFIG_BRIDGE_NETFILTER struct nf_bridge_info *nf_bridge; @@ -457,6 +468,10 @@ #endif #endif +#ifdef CONFIG_NETRXTHREAD + int rxthread_prio; +#endif + __u16 queue_mapping; kmemcheck_bitfield_begin(flags2); #ifdef CONFIG_IPV6_NDISC_NODETYPE @@ -1622,6 +1637,10 @@ * get_rps_cpus() for example only access one 64 bytes aligned block : * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ +#ifdef CONFIG_NETSKBPAD +#define NET_SKB_PAD CONFIG_NETSKBPAD +#endif + #ifndef NET_SKB_PAD #define NET_SKB_PAD max(32, L1_CACHE_BYTES) #endif diff -ruw linux-3.6.7/include/linux/sockios.h linux-3.6.7-fbx/include/linux/sockios.h --- linux-3.6.7/include/linux/sockios.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/sockios.h 2014-04-17 16:28:42.833664590 +0200 @@ -127,6 +127,14 @@ /* hardware time stamping: parameters in linux/net_tstamp.h */ #define SIOCSHWTSTAMP 0x89b0 +/* fbxdiverter call */ +#define SIOCGFBXDIVERT 0x89c0 /* fbxdiverter support */ +#define SIOCSFBXDIVERT 0x89c1 /* Set fbxdiverter options */ + +/* fbxbridge call */ +#define SIOCGFBXBRIDGE 0x89b2 /* fbxbridge support */ +#define SIOCSFBXBRIDGE 0x89b3 /* Set fbxbridge options */ + /* Device private ioctl calls */ /* diff -ruw linux-3.6.7/include/linux/tty.h linux-3.6.7-fbx/include/linux/tty.h --- linux-3.6.7/include/linux/tty.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/tty.h 2014-04-17 16:28:42.877665437 +0200 @@ -34,6 +34,7 @@ #define N_TI_WL 22 /* for TI's WL BT, FM, GPS combo chips */ #define N_TRACESINK 23 /* Trace data routing for MIPI P1149.7 */ #define N_TRACEROUTER 24 /* Trace data routing for MIPI P1149.7 */ +#define N_REMOTI 25 /* RemoTI over UART */ #ifdef __KERNEL__ #include diff -ruw linux-3.6.7/include/net/ip.h linux-3.6.7-fbx/include/net/ip.h --- linux-3.6.7/include/net/ip.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/net/ip.h 2014-04-17 16:28:43.001667825 +0200 @@ -407,6 +407,20 @@ int ip_frag_nqueues(struct net *net); /* + * Functions provided by ip_ffn.c + */ + +enum { + IP_FFN_FINISH_OUT, + IP_FFN_LOCAL_IN, +}; + +extern void ip_ffn_init(void); +extern int ip_ffn_process(struct sk_buff *skb); +extern void ip_ffn_add(struct sk_buff *skb, int when); +extern void ip_ffn_flush_all(void); + +/* * Functions provided by ip_forward.c */ diff -ruw linux-3.6.7/include/net/sch_generic.h linux-3.6.7-fbx/include/net/sch_generic.h --- linux-3.6.7/include/net/sch_generic.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/net/sch_generic.h 2014-04-17 16:28:43.029668364 +0200 @@ -50,6 +50,13 @@ #define TCQ_F_INGRESS 2 #define TCQ_F_CAN_BYPASS 4 #define TCQ_F_MQROOT 8 +#define TCQ_F_ONETXQUEUE 0x10 /* dequeue_skb() can assume all skbs are for + * q->dev_queue : It can test + * netif_xmit_frozen_or_stopped() before + * dequeueing next packet. + * Its true for MQ/MQPRIO slaves, or non + * multiqueue device. + */ #define TCQ_F_WARN_NONWC (1 << 16) int padded; const struct Qdisc_ops *ops; diff -ruw linux-3.6.7/include/net/sock.h linux-3.6.7-fbx/include/net/sock.h --- linux-3.6.7/include/net/sock.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/include/net/sock.h 2014-04-17 16:28:43.041668596 +0200 @@ -162,6 +162,7 @@ unsigned short skc_family; volatile unsigned char skc_state; unsigned char skc_reuse; + unsigned char skc_reuse_conflict; int skc_bound_dev_if; union { struct hlist_node skc_bind_node; @@ -280,6 +281,7 @@ #define sk_family __sk_common.skc_family #define sk_state __sk_common.skc_state #define sk_reuse __sk_common.skc_reuse +#define sk_reuse_conflict __sk_common.skc_reuse_conflict #define sk_bound_dev_if __sk_common.skc_bound_dev_if #define sk_bind_node __sk_common.skc_bind_node #define sk_prot __sk_common.skc_prot @@ -639,6 +641,7 @@ * Will use last 4 bytes of packet sent from * user-space instead. */ + SOCK_UDP_DUP_UNICAST, }; static inline void sock_copy_flags(struct sock *nsk, struct sock *osk) diff -ruw linux-3.6.7/init/initramfs.c linux-3.6.7-fbx/init/initramfs.c --- linux-3.6.7/init/initramfs.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/init/initramfs.c 2014-04-17 16:28:43.157670830 +0200 @@ -602,6 +602,16 @@ fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700); if (fd >= 0) { +#ifdef CONFIG_FBX_DECRYPT_INITRD + int err; + extern int fbx_decrypt_initrd(char *start, + u32 size); + + err = fbx_decrypt_initrd((char*)initrd_start, + initrd_end - initrd_start); + if (err) + printk(KERN_ERR "Decrypt failed: %i\n", err); +#endif sys_write(fd, (char *)initrd_start, initrd_end - initrd_start); sys_close(fd); diff -ruw linux-3.6.7/init/Kconfig linux-3.6.7-fbx/init/Kconfig --- linux-3.6.7/init/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/init/Kconfig 2014-04-17 16:28:43.157670830 +0200 @@ -615,6 +615,15 @@ 13 => 8 KB 12 => 4 KB +config FBX_DECRYPT_INITRD + bool "Decrypt initrd at boot" + depends on BLK_DEV_RAM + default n + +config FBX_DECRYPT_INITRD_KEY + string "Decryption key" + depends on FBX_DECRYPT_INITRD + # # Architectures with an unreliable sched_clock() should select this: # @@ -1144,7 +1153,6 @@ menuconfig EXPERT bool "Configure standard kernel features (expert users)" # Unhide debug options, to make the on-by-default options visible - select DEBUG_KERNEL help This option allows certain base kernel options and settings to be disabled or tweaked. This is for specialized diff -ruw linux-3.6.7/init/Makefile linux-3.6.7-fbx/init/Makefile --- linux-3.6.7/init/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/init/Makefile 2013-09-03 14:19:33.358106023 +0200 @@ -13,6 +13,7 @@ ifneq ($(CONFIG_ARCH_INIT_TASK),y) obj-y += init_task.o endif +obj-$(CONFIG_FBX_DECRYPT_INITRD)+= fbx_decrypt_initrd.o rc4.o mounts-y := do_mounts.o mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o diff -ruw linux-3.6.7/kernel/auditfilter.c linux-3.6.7-fbx/kernel/auditfilter.c --- linux-3.6.7/kernel/auditfilter.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/kernel/auditfilter.c 2014-04-17 16:28:43.181671292 +0200 @@ -878,8 +878,7 @@ int dont_count = 0; /* If either of these, don't count towards total */ - if (entry->rule.listnr == AUDIT_FILTER_USER || - entry->rule.listnr == AUDIT_FILTER_TYPE) + if (entry->rule.listnr == AUDIT_FILTER_USER) dont_count = 1; #endif @@ -957,8 +956,7 @@ int dont_count = 0; /* If either of these, don't count towards total */ - if (entry->rule.listnr == AUDIT_FILTER_USER || - entry->rule.listnr == AUDIT_FILTER_TYPE) + if (entry->rule.listnr == AUDIT_FILTER_USER) dont_count = 1; #endif diff -ruw linux-3.6.7/kernel/fork.c linux-3.6.7-fbx/kernel/fork.c --- linux-3.6.7/kernel/fork.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/kernel/fork.c 2014-04-17 16:28:43.209671832 +0200 @@ -213,6 +213,8 @@ ftrace_graph_exit_task(tsk); put_seccomp_filter(tsk); arch_release_task_struct(tsk); + if (tsk->fbxjail) + kfree(tsk->fbxjail); free_task_struct(tsk); } EXPORT_SYMBOL(free_task); @@ -333,6 +335,11 @@ account_kernel_stack(ti, 1); + /* + * inherit parent exec_mode. + */ + tsk->exec_mode = orig->exec_mode; + return tsk; free_ti: diff -ruw linux-3.6.7/kernel/pid.c linux-3.6.7-fbx/kernel/pid.c --- linux-3.6.7/kernel/pid.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/kernel/pid.c 2014-04-17 16:28:43.361674760 +0200 @@ -79,7 +79,7 @@ .level = 0, .child_reaper = &init_task, }; -EXPORT_SYMBOL_GPL(init_pid_ns); +EXPORT_SYMBOL(init_pid_ns); int is_container_init(struct task_struct *tsk) { diff -ruw linux-3.6.7/kernel/printk.c linux-3.6.7-fbx/kernel/printk.c --- linux-3.6.7/kernel/printk.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/kernel/printk.c 2014-04-17 16:28:43.385675222 +0200 @@ -55,6 +55,10 @@ { } +#ifdef CONFIG_DEBUG_LL +extern void printascii(char *); +#endif + /* printk's without a loglevel use this.. */ #define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL @@ -1538,6 +1542,10 @@ */ text_len = vscnprintf(text, sizeof(textbuf), fmt, args); +#ifdef CONFIG_DEBUG_LL + printascii(text); +#endif + /* mark and strip a trailing newline */ if (text_len && text[text_len-1] == '\n') { text_len--; diff -ruw linux-3.6.7/kernel/ptrace.c linux-3.6.7-fbx/kernel/ptrace.c --- linux-3.6.7/kernel/ptrace.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/kernel/ptrace.c 2014-04-17 16:28:43.385675222 +0200 @@ -117,11 +117,45 @@ * TASK_KILLABLE sleeps. */ if (child->jobctl & JOBCTL_STOP_PENDING || task_is_traced(child)) - signal_wake_up(child, task_is_traced(child)); + ptrace_signal_wake_up(child, true); spin_unlock(&child->sighand->siglock); } +/* Ensure that nothing can wake it up, even SIGKILL */ +static bool ptrace_freeze_traced(struct task_struct *task) +{ + bool ret = false; + + /* Lockless, nobody but us can set this flag */ + if (task->jobctl & JOBCTL_LISTENING) + return ret; + + spin_lock_irq(&task->sighand->siglock); + if (task_is_traced(task) && !__fatal_signal_pending(task)) { + task->state = __TASK_TRACED; + ret = true; + } + spin_unlock_irq(&task->sighand->siglock); + + return ret; +} + +static void ptrace_unfreeze_traced(struct task_struct *task) +{ + if (task->state != __TASK_TRACED) + return; + + WARN_ON(!task->ptrace || task->parent != current); + + spin_lock_irq(&task->sighand->siglock); + if (__fatal_signal_pending(task)) + wake_up_state(task, __TASK_TRACED); + else + task->state = TASK_TRACED; + spin_unlock_irq(&task->sighand->siglock); +} + /** * ptrace_check_attach - check whether ptracee is ready for ptrace operation * @child: ptracee to check for @@ -151,24 +185,29 @@ * be changed by us so it's not changing right after this. */ read_lock(&tasklist_lock); - if ((child->ptrace & PT_PTRACED) && child->parent == current) { + if (child->ptrace && child->parent == current) { + WARN_ON(child->state == __TASK_TRACED); /* * child->sighand can't be NULL, release_task() * does ptrace_unlink() before __exit_signal(). */ - spin_lock_irq(&child->sighand->siglock); - WARN_ON_ONCE(task_is_stopped(child)); - if (ignore_state || (task_is_traced(child) && - !(child->jobctl & JOBCTL_LISTENING))) + if (ignore_state || ptrace_freeze_traced(child)) ret = 0; - spin_unlock_irq(&child->sighand->siglock); } read_unlock(&tasklist_lock); - if (!ret && !ignore_state) - ret = wait_task_inactive(child, TASK_TRACED) ? 0 : -ESRCH; + if (!ret && !ignore_state) { + if (!wait_task_inactive(child, __TASK_TRACED)) { + /* + * This can only happen if may_ptrace_stop() fails and + * ptrace_stop() changes ->state back to TASK_RUNNING, + * so we should not worry about leaking __TASK_TRACED. + */ + WARN_ON(child->state == __TASK_TRACED); + ret = -ESRCH; + } + } - /* All systems go.. */ return ret; } @@ -310,7 +349,7 @@ */ if (task_is_stopped(task) && task_set_jobctl_pending(task, JOBCTL_TRAP_STOP | JOBCTL_TRAPPING)) - signal_wake_up(task, 1); + signal_wake_up_state(task, __TASK_STOPPED); spin_unlock(&task->sighand->siglock); @@ -727,7 +766,7 @@ * tracee into STOP. */ if (likely(task_set_jobctl_pending(child, JOBCTL_TRAP_STOP))) - signal_wake_up(child, child->jobctl & JOBCTL_LISTENING); + ptrace_signal_wake_up(child, child->jobctl & JOBCTL_LISTENING); unlock_task_sighand(child, &flags); ret = 0; @@ -753,7 +792,7 @@ * start of this trap and now. Trigger re-trap. */ if (child->jobctl & JOBCTL_TRAP_NOTIFY) - signal_wake_up(child, true); + ptrace_signal_wake_up(child, true); ret = 0; } unlock_task_sighand(child, &flags); @@ -890,6 +929,8 @@ goto out_put_task_struct; ret = arch_ptrace(child, request, addr, data); + if (ret || request != PTRACE_DETACH) + ptrace_unfreeze_traced(child); out_put_task_struct: put_task_struct(child); @@ -1029,8 +1070,11 @@ ret = ptrace_check_attach(child, request == PTRACE_KILL || request == PTRACE_INTERRUPT); - if (!ret) + if (!ret) { ret = compat_arch_ptrace(child, request, addr, data); + if (ret || request != PTRACE_DETACH) + ptrace_unfreeze_traced(child); + } out_put_task_struct: put_task_struct(child); diff -ruw linux-3.6.7/kernel/resource.c linux-3.6.7-fbx/kernel/resource.c --- linux-3.6.7/kernel/resource.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/kernel/resource.c 2014-04-17 16:28:43.393675376 +0200 @@ -299,15 +299,14 @@ read_lock(&resource_lock); for (p = iomem_resource.child; p ; p = p->sibling) { /* system ram is just marked as IORESOURCE_MEM */ - if (p->flags != res->flags) - continue; - if (name && strcmp(p->name, name)) - continue; if (p->start > end) { p = NULL; break; } - if ((p->end >= start) && (p->start < end)) + if (p->flags != res->flags) + continue; + if ((p->end >= start) && (p->start < end) && + (name == NULL || !strcmp(p->name, name))) break; } read_unlock(&resource_lock); diff -ruw linux-3.6.7/kernel/sched/core.c linux-3.6.7-fbx/kernel/sched/core.c --- linux-3.6.7/kernel/sched/core.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/kernel/sched/core.c 2014-04-17 16:28:43.397675454 +0200 @@ -1686,7 +1686,8 @@ */ int wake_up_process(struct task_struct *p) { - return try_to_wake_up(p, TASK_ALL, 0); + WARN_ON(task_is_stopped_or_traced(p)); + return try_to_wake_up(p, TASK_NORMAL, 0); } EXPORT_SYMBOL(wake_up_process); diff -ruw linux-3.6.7/kernel/seccomp.c linux-3.6.7-fbx/kernel/seccomp.c --- linux-3.6.7/kernel/seccomp.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/kernel/seccomp.c 2014-04-17 16:28:43.401675530 +0200 @@ -30,34 +30,6 @@ #include #include -/** - * struct seccomp_filter - container for seccomp BPF programs - * - * @usage: reference count to manage the object lifetime. - * get/put helpers should be used when accessing an instance - * outside of a lifetime-guarded section. In general, this - * is only needed for handling filters shared across tasks. - * @prev: points to a previously installed, or inherited, filter - * @len: the number of instructions in the program - * @insns: the BPF program instructions to evaluate - * - * seccomp_filter objects are organized in a tree linked via the @prev - * pointer. For any task, it appears to be a singly-linked list starting - * with current->seccomp.filter, the most recently attached or inherited filter. - * However, multiple filters may share a @prev node, by way of fork(), which - * results in a unidirectional tree existing in memory. This is similar to - * how namespaces work. - * - * seccomp_filter objects should never be modified after being attached - * to a task_struct (other than @usage). - */ -struct seccomp_filter { - atomic_t usage; - struct seccomp_filter *prev; - unsigned short len; /* Instruction count */ - struct sock_filter insns[]; -}; - /* Limit any path through the tree to 256KB worth of instructions. */ #define MAX_INSNS_PER_PATH ((1 << 18) / sizeof(struct sock_filter)) @@ -160,6 +132,8 @@ case BPF_S_ALU_AND_X: case BPF_S_ALU_OR_K: case BPF_S_ALU_OR_X: + case BPF_S_ALU_XOR_K: + case BPF_S_ALU_XOR_X: case BPF_S_ALU_LSH_K: case BPF_S_ALU_LSH_X: case BPF_S_ALU_RSH_K: @@ -211,7 +185,7 @@ * value always takes priority (ignoring the DATA). */ for (f = current->seccomp.filter; f; f = f->prev) { - u32 cur_ret = sk_run_filter(NULL, f->insns); + u32 cur_ret = f->bpf_func(NULL, f->insns); if ((cur_ret & SECCOMP_RET_ACTION) < (ret & SECCOMP_RET_ACTION)) ret = cur_ret; } @@ -273,6 +247,9 @@ if (ret) goto fail; + filter->bpf_func = sk_run_filter; + seccomp_jit_compile(filter); + /* * If there is an existing filter, make it the prev and don't drop its * task reference. @@ -330,6 +307,7 @@ while (orig && atomic_dec_and_test(&orig->usage)) { struct seccomp_filter *freeme = orig; orig = orig->prev; + seccomp_jit_free(freeme); kfree(freeme); } } diff -ruw linux-3.6.7/kernel/signal.c linux-3.6.7-fbx/kernel/signal.c --- linux-3.6.7/kernel/signal.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/kernel/signal.c 2014-04-17 16:28:43.405675607 +0200 @@ -483,6 +483,9 @@ if (force_default || ka->sa.sa_handler != SIG_IGN) ka->sa.sa_handler = SIG_DFL; ka->sa.sa_flags = 0; +#if defined(SA_RESTORER) && !defined(CONFIG_MIPS) + ka->sa.sa_restorer = NULL; +#endif sigemptyset(&ka->sa.sa_mask); ka++; } @@ -678,23 +681,17 @@ * No need to set need_resched since signal event passing * goes through ->blocked */ -void signal_wake_up(struct task_struct *t, int resume) +void signal_wake_up_state(struct task_struct *t, unsigned int state) { - unsigned int mask; - set_tsk_thread_flag(t, TIF_SIGPENDING); - /* - * For SIGKILL, we want to wake it up in the stopped/traced/killable + * TASK_WAKEKILL also means wake it up in the stopped/traced/killable * case. We don't check t->state here because there is a race with it * executing another processor and just now entering stopped state. * By using wake_up_state, we ensure the process will wake up and * handle its death signal. */ - mask = TASK_INTERRUPTIBLE; - if (resume) - mask |= TASK_WAKEKILL; - if (!wake_up_state(t, mask)) + if (!wake_up_state(t, state | TASK_INTERRUPTIBLE)) kick_process(t); } @@ -842,7 +839,7 @@ assert_spin_locked(&t->sighand->siglock); task_set_jobctl_pending(t, JOBCTL_TRAP_NOTIFY); - signal_wake_up(t, t->jobctl & JOBCTL_LISTENING); + ptrace_signal_wake_up(t, t->jobctl & JOBCTL_LISTENING); } /* @@ -1797,6 +1794,10 @@ * If SIGKILL was already sent before the caller unlocked * ->siglock we must see ->core_state != NULL. Otherwise it * is safe to enter schedule(). + * + * This is almost outdated, a task with the pending SIGKILL can't + * block in TASK_TRACED. But PTRACE_EVENT_EXIT can be reported + * after SIGKILL was already dequeued. */ if (unlikely(current->mm->core_state) && unlikely(current->mm == current->parent->mm)) @@ -1922,6 +1923,7 @@ if (gstop_done) do_notify_parent_cldstop(current, false, why); + /* tasklist protects us from ptrace_freeze_traced() */ __set_current_state(TASK_RUNNING); if (clear_code) current->exit_code = 0; diff -ruw linux-3.6.7/kernel/sys.c linux-3.6.7-fbx/kernel/sys.c --- linux-3.6.7/kernel/sys.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/kernel/sys.c 2014-04-17 16:28:43.413675761 +0200 @@ -2163,6 +2163,18 @@ if (arg2 || arg3 || arg4 || arg5) return -EINVAL; return current->no_new_privs ? 1 : 0; + case PR_SET_EXEC_MODE: + if (arg2 != EXEC_MODE_UNLIMITED && + arg2 != EXEC_MODE_ONCE && + arg2 != EXEC_MODE_DENIED) + return -EINVAL; + + if (arg2 > current->exec_mode) + return -EPERM; + current->exec_mode = arg2; + return 0; + case PR_GET_EXEC_MODE: + return current->exec_mode; default: error = -EINVAL; break; diff -ruw linux-3.6.7/lib/Kconfig linux-3.6.7-fbx/lib/Kconfig --- linux-3.6.7/lib/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/lib/Kconfig 2014-04-17 16:28:43.489677225 +0200 @@ -396,4 +396,8 @@ config LIBFDT bool +config FBXSERIAL + bool + select CRC32 + endmenu diff -ruw linux-3.6.7/lib/Makefile linux-3.6.7-fbx/lib/Makefile --- linux-3.6.7/lib/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/lib/Makefile 2014-04-17 16:28:43.509677610 +0200 @@ -87,6 +87,8 @@ obj-$(CONFIG_SMP) += percpu_counter.o obj-$(CONFIG_AUDIT_GENERIC) += audit.o +obj-$(CONFIG_FBXSERIAL) += fbxserial.o + obj-$(CONFIG_SWIOTLB) += swiotlb.o obj-$(CONFIG_IOMMU_HELPER) += iommu-helper.o obj-$(CONFIG_FAULT_INJECTION) += fault-inject.o diff -ruw linux-3.6.7/mm/shmem.c linux-3.6.7-fbx/mm/shmem.c --- linux-3.6.7/mm/shmem.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/mm/shmem.c 2014-04-17 16:28:43.633680000 +0200 @@ -2525,6 +2525,7 @@ unsigned long inodes; int error = -EINVAL; + config.mpol = NULL; if (shmem_parse_options(data, &config, true)) return error; @@ -2549,8 +2550,13 @@ sbinfo->max_inodes = config.max_inodes; sbinfo->free_inodes = config.max_inodes - inodes; + /* + * Preserve previous mempolicy unless mpol remount option was specified. + */ + if (config.mpol) { mpol_put(sbinfo->mpol); sbinfo->mpol = config.mpol; /* transfers initial ref */ + } out: spin_unlock(&sbinfo->stat_lock); return error; diff -ruw linux-3.6.7/net/8021q/vlan.c linux-3.6.7-fbx/net/8021q/vlan.c --- linux-3.6.7/net/8021q/vlan.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/8021q/vlan.c 2014-04-17 16:28:43.673680770 +0200 @@ -191,7 +191,7 @@ /* Attach a VLAN device to a mac address (ie Ethernet Card). * Returns 0 if the device was created or a negative error code otherwise. */ -static int register_vlan_device(struct net_device *real_dev, u16 vlan_id) +int register_vlan_device(struct net_device *real_dev, u16 vlan_id) { struct net_device *new_dev; struct net *net = dev_net(real_dev); diff -ruw linux-3.6.7/net/8021q/vlan_core.c linux-3.6.7-fbx/net/8021q/vlan_core.c --- linux-3.6.7/net/8021q/vlan_core.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/8021q/vlan_core.c 2014-04-17 16:28:43.685681001 +0200 @@ -81,6 +81,12 @@ } EXPORT_SYMBOL(__vlan_find_dev_deep); +struct net_device *vlan_dev_upper_dev(const struct net_device *dev) +{ + return vlan_dev_priv(dev)->real_dev; +} +EXPORT_SYMBOL(vlan_dev_upper_dev); + struct net_device *vlan_dev_real_dev(const struct net_device *dev) { return vlan_dev_priv(dev)->real_dev; diff -ruw linux-3.6.7/net/8021q/vlan_dev.c linux-3.6.7-fbx/net/8021q/vlan_dev.c --- linux-3.6.7/net/8021q/vlan_dev.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/8021q/vlan_dev.c 2014-04-17 16:28:43.685681001 +0200 @@ -28,6 +28,7 @@ #include #include #include +#include #include #include "vlan.h" @@ -75,7 +76,7 @@ mp = vlan_dev_priv(dev)->egress_priority_map[(skb->priority & 0xF)]; while (mp) { - if (mp->priority == skb->priority) { + if (mp->priority == (skb->priority & TC_H_MIN_MASK)) { return mp->vlan_qos; /* This should already be shifted * to mask correctly with the * VLAN's TCI */ diff -ruw linux-3.6.7/net/bluetooth/hci_sock.c linux-3.6.7-fbx/net/bluetooth/hci_sock.c --- linux-3.6.7/net/bluetooth/hci_sock.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/bluetooth/hci_sock.c 2014-04-17 16:28:43.793683081 +0200 @@ -928,6 +928,7 @@ { struct hci_filter *f = &hci_pi(sk)->filter; + memset(&uf, 0, sizeof(uf)); uf.type_mask = f->type_mask; uf.opcode = f->opcode; uf.event_mask[0] = *((u32 *) f->event_mask + 0); diff -ruw linux-3.6.7/net/core/dev.c linux-3.6.7-fbx/net/core/dev.c --- linux-3.6.7/net/core/dev.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/core/dev.c 2014-04-17 17:00:38.222938152 +0200 @@ -135,6 +135,7 @@ #include #include #include +#include #include "net-sysfs.h" @@ -179,6 +180,19 @@ static struct list_head ptype_base[PTYPE_HASH_SIZE] __read_mostly; static struct list_head ptype_all __read_mostly; /* Taps */ +#ifdef CONFIG_NETRXTHREAD + +#define RXTHREAD_MAX_PROCESS CONFIG_NETRXTHREAD_MAX_PROCESS +#define RXTHREAD_MAX_PKTS 128 + +static struct task_struct *krxd; +static struct sk_buff_head krxd_pkt_queue[CONFIG_NETRXTHREAD_RX_QUEUE]; +static unsigned int krxd_stats_pkts[CONFIG_NETRXTHREAD_RX_QUEUE]; +static unsigned int krxd_stats_dropped[CONFIG_NETRXTHREAD_RX_QUEUE]; +static wait_queue_head_t krxd_wq; +static unsigned int krxd_pkts_count; +#endif + /* * The @dev_base_head list is protected by @dev_base_lock and the rtnl * semaphore. @@ -2933,6 +2947,23 @@ return NET_RX_DROP; } +/* Start Freebox added code */ +#if defined(CONFIG_FREEBOX_DIVERTER) || defined(CONFIG_FREEBOX_DIVERTER_MODULE) +int (*fbxdiverter_hook)(struct sk_buff *); + +static int handle_fbxdiverter(struct sk_buff *skb) +{ + /* try_module_get is missing here, so there is a race on + * fbxdiverter module deletion */ + if (!fbxdiverter_hook) + return 0; + return fbxdiverter_hook(skb); +} + +EXPORT_SYMBOL(fbxdiverter_hook); +#endif + + /** * netif_rx - post buffer to the network code * @skb: buffer to post @@ -3066,6 +3097,36 @@ EXPORT_SYMBOL_GPL(br_fdb_test_addr_hook); #endif +#if defined(CONFIG_FBXBRIDGE) || defined(CONFIG_FBXBRIDGE_MODULE) +struct sk_buff *(*fbxbridge_handle_frame_hook)(struct fbxbridge *p, struct sk_buff *skb); + +struct fbxbridge; + +static inline struct sk_buff *handle_fbxbridge(struct sk_buff *skb, + struct packet_type **pt_prev, int *ret, + struct net_device *orig_dev) +{ + struct fbxbridge *fbxbr; + + if (skb->pkt_type == PACKET_LOOPBACK || + (fbxbr = skb->dev->fbx_bridge_port) == NULL) + return skb; + + if (skb->protocol != __constant_htons(ETH_P_IP) && + skb->protocol != __constant_htons(ETH_P_ARP)) + return skb; + + if (*pt_prev) { + *ret = deliver_skb(skb, *pt_prev, orig_dev); + *pt_prev = NULL; + } + + return fbxbridge_handle_frame_hook(fbxbr, skb); +} +#else +#define handle_fbxbridge(skb, pt_prev, ret, orig_dev) (skb) +#endif + #ifdef CONFIG_NET_CLS_ACT /* TODO: Maybe we should just force sch_ingress to be compiled in * when CONFIG_NET_CLS_ACT is? otherwise some useless instructions @@ -3193,7 +3254,9 @@ } } -static int __netif_receive_skb(struct sk_buff *skb) +static int __netif_receive_skb(struct sk_buff *skb); + +static int __netif_receive_skb_end(struct sk_buff *skb) { struct packet_type *ptype, *pt_prev; rx_handler_func_t *rx_handler; @@ -3204,10 +3267,6 @@ __be16 type; unsigned long pflags = current->flags; - net_timestamp_check(!netdev_tstamp_prequeue, skb); - - trace_netif_receive_skb(skb); - /* * PFMEMALLOC skbs are special, they should * - be delivered to SOCK_MEMALLOC sockets only @@ -3220,16 +3279,7 @@ if (sk_memalloc_socks() && skb_pfmemalloc(skb)) current->flags |= PF_MEMALLOC; - /* if we've gotten here through NAPI, check netpoll */ - if (netpoll_receive_skb(skb)) - goto out; - orig_dev = skb->dev; - - skb_reset_network_header(skb); - skb_reset_transport_header(skb); - skb_reset_mac_len(skb); - pt_prev = NULL; rcu_read_lock(); @@ -3264,6 +3314,10 @@ } skip_taps: + skb = handle_fbxbridge(skb, &pt_prev, &ret, orig_dev); + if (!skb) + goto unlock; + #ifdef CONFIG_NET_CLS_ACT skb = handle_ing(skb, &pt_prev, &ret, orig_dev); if (!skb) @@ -3341,11 +3395,182 @@ unlock: rcu_read_unlock(); -out: tsk_restore_flags(current, pflags, PF_MEMALLOC); return ret; } +#ifdef CONFIG_NETRXTHREAD + + +static int krxd_action(void *unused) +{ + struct sk_buff *skb; + + set_user_nice(current, -5); + current->flags |= PF_NOFREEZE; + __set_current_state(TASK_RUNNING); + + local_bh_disable(); + while (1) { + unsigned int i, queue, count; + + count = CONFIG_NETRXTHREAD_RX_QUEUE; + for (i = 0; i < count; i++) { + queue = count - i - 1; + skb = skb_dequeue(&krxd_pkt_queue[queue]); + if (!skb) + continue; + krxd_pkts_count--; + break; + } + + if (!skb) { + local_bh_enable(); + wait_event_interruptible(krxd_wq, + krxd_pkts_count != 0); + set_current_state(TASK_RUNNING); + local_bh_disable(); + continue; + } + + __netif_receive_skb_end(skb); + + /* only schedule when working on lowest prio queue */ + if (queue == 0) { + if (need_resched()) { + local_bh_enable(); + schedule(); + local_bh_disable(); + } + } + } + return 0; +} + +#ifdef CONFIG_PROC_FS +/* + * This is invoked by the /proc filesystem handler to display a device + * in detail. + */ +void *krxthread_seq_start(struct seq_file *seq, loff_t *pos) +{ + int *queue; + + if (*pos > CONFIG_NETRXTHREAD_RX_QUEUE) + return NULL; + + queue = kmalloc(sizeof(*queue), GFP_KERNEL); + if (!queue) + return NULL; + *queue = ((int)*pos - 1); + + return queue; +} + +void *krxthread_seq_next(struct seq_file *seq, void *v, loff_t *pos) +{ + int *queue = v; + + if (*pos == CONFIG_NETRXTHREAD_RX_QUEUE) + return NULL; + + ++*queue; + *pos = *queue + 1; + return queue; +} + +void krxthread_seq_stop(struct seq_file *seq, void *v) +{ + kfree(v); +} + +static void krxthread_seq_printf_stats(struct seq_file *seq, int queue) +{ + seq_printf(seq, "%8u %12u %12u\n", + queue, + krxd_stats_pkts[queue], + krxd_stats_dropped[queue]); +} + +static int krxthread_seq_show(struct seq_file *seq, void *v) +{ + int *queue = v; + + if (*queue == -1) + seq_printf(seq, "%8s %12s %12s\n", + "queue", "packets", "drops"); + else + krxthread_seq_printf_stats(seq, *queue); + return 0; +} + +static const struct seq_operations krxthread_seq_ops = { + .start = krxthread_seq_start, + .next = krxthread_seq_next, + .stop = krxthread_seq_stop, + .show = krxthread_seq_show, +}; + +static int krxthread_seq_open(struct inode *inode, struct file *file) +{ + return seq_open(file, &krxthread_seq_ops); +} + +static const struct file_operations krxthread_seq_fops = { + .owner = THIS_MODULE, + .open = krxthread_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, +}; +#endif /* PROCFS */ +#endif /* RXTHREAD */ + +static int __netif_receive_skb(struct sk_buff *skb) +{ +#ifdef CONFIG_NETRXTHREAD + unsigned int len, queue; +#endif + net_timestamp_check(!netdev_tstamp_prequeue, skb); + + trace_netif_receive_skb(skb); + + /* if we've gotten here through NAPI, check netpoll */ + if (netpoll_receive_skb(skb)) + return NET_RX_DROP; + + skb_reset_network_header(skb); + skb_reset_transport_header(skb); + skb_reset_mac_len(skb); + +#if defined(CONFIG_FREEBOX_DIVERTER) || defined(CONFIG_FREEBOX_DIVERTER_MODULE) + if (handle_fbxdiverter(skb)) + return NET_RX_SUCCESS; +#endif + +#ifndef CONFIG_NETRXTHREAD + return __netif_receive_skb_end(skb); +#else + queue = skb->rxthread_prio & 1; + + /* queue the packet to the rx thread */ + local_bh_disable(); + len = skb_queue_len(&krxd_pkt_queue[queue]); + if (len < RXTHREAD_MAX_PKTS) { + __skb_queue_tail(&krxd_pkt_queue[queue], skb); + krxd_pkts_count++; + krxd_stats_pkts[queue]++; + if (!len) + wake_up(&krxd_wq); + } else { + krxd_stats_dropped[queue]++; + dev_kfree_skb(skb); + } + local_bh_enable(); + return NET_RX_SUCCESS; +#endif +} + /** * netif_receive_skb - process receive buffer from network * @skb: buffer to process @@ -4407,7 +4632,11 @@ goto out_dev; if (!proc_net_fops_create(net, "ptype", S_IRUGO, &ptype_seq_fops)) goto out_softnet; - +#ifdef CONFIG_NETRXTHREAD + if (!proc_net_fops_create(net, "krxthread", S_IRUGO, + &krxthread_seq_fops)) + goto out; +#endif if (wext_proc_init(net)) goto out_ptype; rc = 0; @@ -5794,7 +6023,7 @@ rebroadcast_time = jiffies; } - msleep(250); + msleep(1); refcnt = netdev_refcnt_read(dev); @@ -6640,6 +6869,19 @@ open_softirq(NET_TX_SOFTIRQ, net_tx_action); open_softirq(NET_RX_SOFTIRQ, net_rx_action); +#ifdef CONFIG_NETRXTHREAD + for (i = 0; i < CONFIG_NETRXTHREAD_RX_QUEUE; i++) + skb_queue_head_init(&krxd_pkt_queue[i]); + krxd_pkts_count = 0; + init_waitqueue_head(&krxd_wq); + krxd = kthread_create(krxd_action, NULL, "krxthread"); + if (IS_ERR(krxd)) { + printk(KERN_ERR "unable to create krxd\n"); + return -ENOMEM; + } + wake_up_process(krxd); +#endif + hotcpu_notifier(dev_cpu_callback, 0); dst_init(); dev_mcast_init(); @@ -6658,3 +6900,6 @@ late_initcall_sync(initialize_hashrnd); +#if defined(CONFIG_FBXBRIDGE_MODULE) +EXPORT_SYMBOL(fbxbridge_handle_frame_hook); +#endif diff -ruw linux-3.6.7/net/core/filter.c linux-3.6.7-fbx/net/core/filter.c --- linux-3.6.7/net/core/filter.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/core/filter.c 2014-04-17 16:28:43.861684391 +0200 @@ -179,6 +179,13 @@ case BPF_S_ALU_OR_K: A |= K; continue; + case BPF_S_ANC_ALU_XOR_X: + case BPF_S_ALU_XOR_X: + A ^= X; + continue; + case BPF_S_ALU_XOR_K: + A ^= K; + continue; case BPF_S_ALU_LSH_X: A <<= X; continue; @@ -326,9 +333,6 @@ case BPF_S_ANC_CPU: A = raw_smp_processor_id(); continue; - case BPF_S_ANC_ALU_XOR_X: - A ^= X; - continue; case BPF_S_ANC_NLATTR: { struct nlattr *nla; @@ -473,6 +477,8 @@ [BPF_ALU|BPF_AND|BPF_X] = BPF_S_ALU_AND_X, [BPF_ALU|BPF_OR|BPF_K] = BPF_S_ALU_OR_K, [BPF_ALU|BPF_OR|BPF_X] = BPF_S_ALU_OR_X, + [BPF_ALU|BPF_XOR|BPF_K] = BPF_S_ALU_XOR_K, + [BPF_ALU|BPF_XOR|BPF_X] = BPF_S_ALU_XOR_X, [BPF_ALU|BPF_LSH|BPF_K] = BPF_S_ALU_LSH_K, [BPF_ALU|BPF_LSH|BPF_X] = BPF_S_ALU_LSH_X, [BPF_ALU|BPF_RSH|BPF_K] = BPF_S_ALU_RSH_K, diff -ruw linux-3.6.7/net/core/rtnetlink.c linux-3.6.7-fbx/net/core/rtnetlink.c --- linux-3.6.7/net/core/rtnetlink.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/core/rtnetlink.c 2014-04-17 16:28:43.885684853 +0200 @@ -976,6 +976,7 @@ * report anything. */ ivi.spoofchk = -1; + memset(ivi.mac, 0, sizeof(ivi.mac)); if (dev->netdev_ops->ndo_get_vf_config(dev, i, &ivi)) break; vf_mac.vf = diff -ruw linux-3.6.7/net/core/skbuff.c linux-3.6.7-fbx/net/core/skbuff.c --- linux-3.6.7/net/core/skbuff.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/core/skbuff.c 2014-04-17 17:00:38.234938395 +0200 @@ -667,6 +667,9 @@ new->ipvs_property = old->ipvs_property; #endif new->pfmemalloc = old->pfmemalloc; +#ifdef CONFIG_IP_FFN + new->ffn_state = FFN_STATE_INIT; +#endif new->protocol = old->protocol; new->mark = old->mark; new->skb_iif = old->skb_iif; diff -ruw linux-3.6.7/net/core/sock.c linux-3.6.7-fbx/net/core/sock.c --- linux-3.6.7/net/core/sock.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/core/sock.c 2014-04-17 16:28:43.885684853 +0200 @@ -851,6 +851,10 @@ sock_valbool_flag(sk, SOCK_NOFCS, valbool); break; + case SO_UDP_DUP_UNICAST: + sock_valbool_flag(sk, SOCK_UDP_DUP_UNICAST, valbool); + break; + default: ret = -ENOPROTOOPT; break; @@ -1085,6 +1089,9 @@ case SO_NOFCS: v.val = sock_flag(sk, SOCK_NOFCS); break; + case SO_UDP_DUP_UNICAST: + v.val = sock_flag(sk, SOCK_UDP_DUP_UNICAST); + break; default: return -ENOPROTOOPT; } diff -ruw linux-3.6.7/net/core/sock_diag.c linux-3.6.7-fbx/net/core/sock_diag.c --- linux-3.6.7/net/core/sock_diag.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/core/sock_diag.c 2014-04-17 16:28:43.885684853 +0200 @@ -121,6 +121,9 @@ if (nlmsg_len(nlh) < sizeof(*req)) return -EINVAL; + if (req->sdiag_family >= AF_MAX) + return -EINVAL; + hndl = sock_diag_lock_handler(req->sdiag_family); if (hndl == NULL) err = -ENOENT; diff -ruw linux-3.6.7/net/ipv4/ipconfig.c linux-3.6.7-fbx/net/ipv4/ipconfig.c --- linux-3.6.7/net/ipv4/ipconfig.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv4/ipconfig.c 2014-04-17 16:28:43.989686856 +0200 @@ -189,15 +189,61 @@ static struct ic_device *ic_first_dev __initdata = NULL;/* List of open device */ static struct net_device *ic_dev __initdata = NULL; /* Selected device */ -static bool __init ic_is_init_dev(struct net_device *dev) +static bool __init ic_is_init_dev(struct net_device *dev, bool partial) { + char *p = NULL; + bool ret; + if (dev->flags & IFF_LOOPBACK) return false; - return user_dev_name[0] ? !strcmp(dev->name, user_dev_name) : + + if (partial) { + p = strchr(user_dev_name, '.'); + if (p) + *p = 0; + } + + ret = false; + if (user_dev_name[0] ? !strcmp(dev->name, user_dev_name) : (!(dev->flags & IFF_LOOPBACK) && (dev->flags & (IFF_POINTOPOINT|IFF_BROADCAST)) && - strncmp(dev->name, "dummy", 5)); + strncmp(dev->name, "dummy", 5))) + ret = true; + if (p) + *p = '.'; + return ret; +} + +#ifdef CONFIG_VLAN_8021Q +int register_vlan_device(struct net_device *real_dev, u16 vlan_id); + +static void __init prepare_vlan(void) +{ + unsigned short oflags; + struct net_device *dev; + char *p; + u16 vid; + + if (!strchr(user_dev_name, '.')) + return; + + p = strchr(user_dev_name, '.'); + *p = 0; + vid = simple_strtoul(p + 1, NULL, 10); + dev = __dev_get_by_name(&init_net, user_dev_name); + if (!dev) + goto fail; + + oflags = dev->flags; + if (dev_change_flags(dev, oflags | IFF_UP) < 0) + goto fail; + + register_vlan_device(dev, vid); + +fail: + *p = '.'; } +#endif static int __init ic_open_devs(void) { @@ -217,8 +263,13 @@ pr_err("IP-Config: Failed to open %s\n", dev->name); } +#ifdef CONFIG_VLAN_8021Q + /* register vlan device if needed */ + prepare_vlan(); +#endif + for_each_netdev(&init_net, dev) { - if (ic_is_init_dev(dev)) { + if (ic_is_init_dev(dev, false)) { int able = 0; if (dev->mtu >= 364) able |= IC_BOOTP; @@ -263,7 +314,7 @@ start = jiffies; while (jiffies - start < msecs_to_jiffies(CONF_CARRIER_TIMEOUT)) { for_each_netdev(&init_net, dev) - if (ic_is_init_dev(dev) && netif_carrier_ok(dev)) + if (ic_is_init_dev(dev, false) && netif_carrier_ok(dev)) goto have_carrier; msleep(1); @@ -695,8 +746,10 @@ e += len; } if (*vendor_class_identifier) { +#ifdef IPCONFIG_DEBUG pr_info("DHCP: sending class identifier \"%s\"\n", vendor_class_identifier); +#endif *e++ = 60; /* Class-identifier */ len = strlen(vendor_class_identifier); *e++ = len; @@ -1355,7 +1408,7 @@ rtnl_lock(); for_each_netdev(&init_net, dev) { - if (ic_is_init_dev(dev)) { + if (ic_is_init_dev(dev, true)) { found = 1; break; } diff -ruw linux-3.6.7/net/ipv4/ip_input.c linux-3.6.7-fbx/net/ipv4/ip_input.c --- linux-3.6.7/net/ipv4/ip_input.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv4/ip_input.c 2014-04-17 16:28:43.977686626 +0200 @@ -186,10 +186,15 @@ return false; } -static int ip_local_deliver_finish(struct sk_buff *skb) +int ip_local_deliver_finish(struct sk_buff *skb) { struct net *net = dev_net(skb->dev); +#ifdef CONFIG_IP_FFN + if (skb->ffn_state == FFN_STATE_FORWARDABLE) + ip_ffn_add(skb, IP_FFN_LOCAL_IN); +#endif + __skb_pull(skb, ip_hdrlen(skb)); /* Point into the IP datagram, just past the header. */ @@ -448,6 +453,11 @@ /* Must drop socket now because of tproxy. */ skb_orphan(skb); +#ifdef CONFIG_IP_FFN + if (!ip_ffn_process(skb)) + return NET_RX_SUCCESS; +#endif + return NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, skb, dev, NULL, ip_rcv_finish); diff -ruw linux-3.6.7/net/ipv4/ip_output.c linux-3.6.7-fbx/net/ipv4/ip_output.c --- linux-3.6.7/net/ipv4/ip_output.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv4/ip_output.c 2014-04-17 16:28:43.989686856 +0200 @@ -192,6 +192,11 @@ skb = skb2; } +#ifdef CONFIG_IP_FFN + if (skb->ffn_state == FFN_STATE_FORWARDABLE) + ip_ffn_add(skb, IP_FFN_FINISH_OUT); +#endif + rcu_read_lock_bh(); nexthop = (__force u32) rt_nexthop(rt, ip_hdr(skb)->daddr); neigh = __ipv4_neigh_lookup_noref(dev, nexthop); @@ -199,7 +204,6 @@ neigh = __neigh_create(&arp_tbl, &nexthop, dev, false); if (!IS_ERR(neigh)) { int res = dst_neigh_output(dst, neigh, skb); - rcu_read_unlock_bh(); return res; } @@ -304,6 +308,11 @@ skb->dev = dev; skb->protocol = htons(ETH_P_IP); +#ifdef CONFIG_IP_FFN + if (skb->ffn_state == FFN_STATE_FAST_FORWARDED) + return ip_finish_output(skb); +#endif + return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, skb, NULL, dev, ip_finish_output, !(IPCB(skb)->flags & IPSKB_REROUTED)); @@ -1553,4 +1562,7 @@ #if defined(CONFIG_IP_MULTICAST) && defined(CONFIG_PROC_FS) igmp_mc_proc_init(); #endif +#ifdef CONFIG_IP_FFN + ip_ffn_init(); +#endif } diff -ruw linux-3.6.7/net/ipv4/Kconfig linux-3.6.7-fbx/net/ipv4/Kconfig --- linux-3.6.7/net/ipv4/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv4/Kconfig 2014-04-17 16:28:43.957686240 +0200 @@ -367,6 +367,11 @@ tristate default n +config INET_XFRM_GC_THRESH + int "IP: xfrm garbage collect threshold" + depends on XFRM + default 1024 + config INET_XFRM_MODE_TRANSPORT tristate "IP: IPsec transport mode" default y diff -ruw linux-3.6.7/net/ipv4/Makefile linux-3.6.7-fbx/net/ipv4/Makefile --- linux-3.6.7/net/ipv4/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv4/Makefile 2014-04-17 16:28:43.957686240 +0200 @@ -14,6 +14,8 @@ inet_fragment.o ping.o obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o + +obj-$(CONFIG_IP_FFN) += ip_ffn.o obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_IP_MULTIPLE_TABLES) += fib_rules.o obj-$(CONFIG_IP_MROUTE) += ipmr.o diff -ruw linux-3.6.7/net/ipv4/netfilter/ip_tables.c linux-3.6.7-fbx/net/ipv4/netfilter/ip_tables.c --- linux-3.6.7/net/ipv4/netfilter/ip_tables.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv4/netfilter/ip_tables.c 2014-04-17 17:00:38.238938476 +0200 @@ -1280,6 +1280,10 @@ tmp.num_counters, tmp.counters); if (ret) goto free_newinfo_untrans; + +#ifdef CONFIG_IP_FFN + ip_ffn_flush_all(); +#endif return 0; free_newinfo_untrans: diff -ruw linux-3.6.7/net/ipv4/netfilter/Kconfig linux-3.6.7-fbx/net/ipv4/netfilter/Kconfig --- linux-3.6.7/net/ipv4/netfilter/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv4/netfilter/Kconfig 2014-04-17 16:28:43.993686934 +0200 @@ -5,6 +5,13 @@ menu "IP: Netfilter Configuration" depends on INET && NETFILTER +config IP_FFN + bool "IP: Fast forwarding and NAT" + +config IP_FFN_PROCFS + bool "IP: Fast forwarding and NAT /proc/net entries" + depends on IP_FFN + config NF_DEFRAG_IPV4 tristate default n diff -ruw linux-3.6.7/net/ipv4/route.c linux-3.6.7-fbx/net/ipv4/route.c --- linux-3.6.7/net/ipv4/route.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv4/route.c 2014-04-17 16:28:44.025687550 +0200 @@ -1785,6 +1785,7 @@ if (dev_out->flags & IFF_LOOPBACK) flags |= RTCF_LOCAL; + do_cache = true; if (type == RTN_BROADCAST) { flags |= RTCF_BROADCAST | RTCF_LOCAL; fi = NULL; @@ -1793,6 +1794,8 @@ if (!ip_check_mc_rcu(in_dev, fl4->daddr, fl4->saddr, fl4->flowi4_proto)) flags &= ~RTCF_LOCAL; + else + do_cache = false; /* If multicast route do not exist use * default one, but do not gateway in this case. * Yes, it is hack. @@ -1802,8 +1805,8 @@ } fnhe = NULL; - do_cache = fi != NULL; - if (fi) { + do_cache &= fi != NULL; + if (do_cache) { struct rtable __rcu **prth; struct fib_nh *nh = &FIB_RES_NH(*res); diff -ruw linux-3.6.7/net/ipv4/udp.c linux-3.6.7-fbx/net/ipv4/udp.c --- linux-3.6.7/net/ipv4/udp.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv4/udp.c 2014-04-17 16:28:44.057688166 +0200 @@ -201,6 +201,8 @@ const struct sock *sk2), unsigned int hash2_nulladdr) { + struct sock *sk2; + struct hlist_nulls_node *node; struct udp_hslot *hslot, *hslot2; struct udp_table *udptable = sk->sk_prot->h.udp_table; int error = 1; @@ -280,6 +282,48 @@ inet_sk(sk)->inet_num = snum; udp_sk(sk)->udp_port_hash = snum; udp_sk(sk)->udp_portaddr_hash ^= snum; + + /* resolve udp reuse conflict */ + if (sk->sk_reuse) { + bool found; + + found = false; + sk_nulls_for_each(sk2, node, &hslot->head) { + if (!net_eq(sock_net(sk2), net) || + sk2 == sk || + (udp_sk(sk2)->udp_port_hash != snum)) + continue; + + if (sk2->sk_bound_dev_if && + sk->sk_bound_dev_if && + sk2->sk_bound_dev_if != sk->sk_bound_dev_if) + continue; + + if (!(*saddr_comp)(sk, sk2)) + continue; + + found = true; + break; + } + + sk_nulls_for_each(sk2, node, &hslot->head) { + if (!net_eq(sock_net(sk2), net) || + sk2 == sk || + (udp_sk(sk2)->udp_port_hash != snum)) + continue; + + if (sk2->sk_bound_dev_if && + sk->sk_bound_dev_if && + sk2->sk_bound_dev_if != sk->sk_bound_dev_if) + continue; + + if (!(*saddr_comp)(sk, sk2)) + continue; + + sk->sk_reuse_conflict = found; + } + } + if (sk_unhashed(sk)) { sk_nulls_add_node_rcu(sk, &hslot->head); hslot->count++; @@ -1595,6 +1639,64 @@ return 0; } +/* + * Unicast goes to one listener and all sockets with dup flag + * + * Note: called only from the BH handler context. + */ +static int __udp4_lib_uc_conflict_deliver(struct net *net, struct sk_buff *skb, + struct udphdr *uh, + __be32 saddr, __be32 daddr, + struct udp_table *udptable) +{ + struct sock *sk, *stack[256 / sizeof(struct sock *)]; + struct udp_hslot *hslot = udp_hashslot(udptable, net, ntohs(uh->dest)); + int dif; + unsigned int i, count = 0, non_dup_count = 0; + + spin_lock(&hslot->lock); + sk = sk_nulls_head(&hslot->head); + dif = skb->dev->ifindex; + sk = udp_v4_mcast_next(net, sk, uh->dest, daddr, uh->source, saddr, dif); + while (sk) { + if (!sock_flag(sk, SOCK_UDP_DUP_UNICAST)) { + if (!non_dup_count) + stack[count++] = sk; + non_dup_count = 1; + } else + stack[count++] = sk; + + sk = udp_v4_mcast_next(net, sk_nulls_next(sk), uh->dest, + daddr, uh->source, saddr, dif); + if (unlikely(count == ARRAY_SIZE(stack))) { + if (!sk) + break; + flush_stack(stack, count, skb, ~0); + count = 0; + } + } + /* + * before releasing chain lock, we must take a reference on sockets + */ + for (i = 0; i < count; i++) + sock_hold(stack[i]); + + spin_unlock(&hslot->lock); + + /* + * do the slow work with no lock held + */ + if (count) { + flush_stack(stack, count, skb, count - 1); + + for (i = 0; i < count; i++) + sock_put(stack[i]); + } else { + kfree_skb(skb); + } + return 0; +} + /* Initialize UDP checksum. If exited with zero value (success), * CHECKSUM_UNNECESSARY means, that no more checks are required. * Otherwise, csum completion requires chacksumming packet body, @@ -1678,7 +1780,16 @@ sk = __udp4_lib_lookup_skb(skb, uh->source, uh->dest, udptable); if (sk != NULL) { - int ret = udp_queue_rcv_skb(sk, skb); + int ret; + + if (sk->sk_reuse_conflict) { + sock_put(sk); + return __udp4_lib_uc_conflict_deliver(net, skb, uh, + saddr, daddr, + udptable); + } + + ret = udp_queue_rcv_skb(sk, skb); sock_put(sk); /* a return value > 0 means to resubmit the input, but diff -ruw linux-3.6.7/net/ipv4/xfrm4_policy.c linux-3.6.7-fbx/net/ipv4/xfrm4_policy.c --- linux-3.6.7/net/ipv4/xfrm4_policy.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv4/xfrm4_policy.c 2014-04-17 16:28:44.057688166 +0200 @@ -235,7 +235,7 @@ .destroy = xfrm4_dst_destroy, .ifdown = xfrm4_dst_ifdown, .local_out = __ip_local_out, - .gc_thresh = 1024, + .gc_thresh = CONFIG_INET_XFRM_GC_THRESH, }; static struct xfrm_policy_afinfo xfrm4_policy_afinfo = { diff -ruw linux-3.6.7/net/ipv6/inet6_connection_sock.c linux-3.6.7-fbx/net/ipv6/inet6_connection_sock.c --- linux-3.6.7/net/ipv6/inet6_connection_sock.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv6/inet6_connection_sock.c 2014-04-17 16:28:44.085688705 +0200 @@ -252,6 +252,7 @@ return NULL; dst->ops->update_pmtu(dst, sk, NULL, mtu); - return inet6_csk_route_socket(sk, &fl6); + dst = inet6_csk_route_socket(sk, &fl6); + return IS_ERR(dst) ? NULL : dst; } EXPORT_SYMBOL_GPL(inet6_csk_update_pmtu); diff -ruw linux-3.6.7/net/ipv6/Kconfig linux-3.6.7-fbx/net/ipv6/Kconfig --- linux-3.6.7/net/ipv6/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv6/Kconfig 2014-04-17 16:28:44.061688244 +0200 @@ -192,6 +192,11 @@ config IPV6_NDISC_NODETYPE bool +config IPV6_SIT_FBX6TO4 + bool "sit support Freebox 6to4 scheme" + depends on IPV6_SIT + default n + config IPV6_TUNNEL tristate "IPv6: IP-in-IPv6 tunnel (RFC2473)" select INET6_TUNNEL diff -ruw linux-3.6.7/net/ipv6/sit.c linux-3.6.7-fbx/net/ipv6/sit.c --- linux-3.6.7/net/ipv6/sit.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv6/sit.c 2014-04-17 16:28:44.097688937 +0200 @@ -35,6 +35,8 @@ #include #include #include +#include + #include #include @@ -248,11 +250,20 @@ if (local == t->parms.iph.saddr && remote == t->parms.iph.daddr && parms->link == t->parms.link) { +#ifdef CONFIG_IPV6_SIT_FBX6TO4 + if (!memcmp(&parms->fbx6to4_zone,&t->parms.fbx6to4_zone, + sizeof (parms->fbx6to4_zone)) && + parms->fbx6to4_prefix == t->parms.fbx6to4_prefix) { +#endif if (create) return NULL; else return t; +#ifdef CONFIG_IPV6_SIT_FBX6TO4 } +#endif + } + } if (!create) goto failed; @@ -680,6 +691,32 @@ return dst; } +#ifdef CONFIG_IPV6_SIT_FBX6TO4 +/* Returns the embedded IPv4 address if the IPv6 address comes from + Freebox 6to4 rule */ +static inline __be32 try_fbx6to4(const struct in6_addr *fbx6to4_zone, + u8 fbx6to4_prefix, + const struct in6_addr *v6dst) +{ + __be32 dst = 0; + + /* isolate zone according to mask */ + if (ipv6_prefix_equal(v6dst, fbx6to4_zone, fbx6to4_prefix)) { + unsigned int d32_off, bits; + + d32_off = fbx6to4_prefix >> 5; + bits = (fbx6to4_prefix & 0x1f); + + dst = (ntohl(v6dst->s6_addr32[d32_off]) << bits); + if (bits) + dst |= ntohl(v6dst->s6_addr32[d32_off + 1]) >> + (32 - bits); + dst = htonl(dst); + } + return dst; +} +#endif + /* * This function assumes it is being called from dev_queue_xmit() * and that skb is filled properly by that function. @@ -737,6 +774,13 @@ goto tx_error; } +#ifdef CONFIG_IPV6_SIT_FBX6TO4 + if (!dst && tunnel->parms.fbx6to4_prefix) + dst = try_fbx6to4(&tunnel->parms.fbx6to4_zone, + tunnel->parms.fbx6to4_prefix, + &iph6->daddr); + else +#endif if (!dst) dst = try_6rd(&iph6->daddr, tunnel); @@ -871,6 +915,10 @@ iph->ttl = iph6->hop_limit; nf_reset(skb); + skb->nfct = &nf_ct_untracked_get()->ct_general; + skb->nfctinfo = IP_CT_NEW; + nf_conntrack_get(skb->nfct); + tstats = this_cpu_ptr(dev->tstats); __IPTUNNEL_XMIT(tstats, &dev->stats); return NETDEV_TX_OK; @@ -986,6 +1034,13 @@ if (p.iph.ttl) p.iph.frag_off |= htons(IP_DF); +#ifdef CONFIG_IPV6_SIT_FBX6TO4 + /* prefix must be smaller than 95 bits since we fetch + * an ip address after them */ + if (p.fbx6to4_prefix >= 95) + goto done; +#endif + t = ipip6_tunnel_locate(net, &p, cmd == SIOCADDTUNNEL); if (dev != sitn->fb_tunnel_dev && cmd == SIOCCHGTUNNEL) { @@ -1005,6 +1060,10 @@ synchronize_net(); t->parms.iph.saddr = p.iph.saddr; t->parms.iph.daddr = p.iph.daddr; +#ifdef CONFIG_IPV6_SIT_FBX6TO4 + t->parms.fbx6to4_zone = p.fbx6to4_zone; + t->parms.fbx6to4_prefix = p.fbx6to4_prefix; +#endif memcpy(dev->dev_addr, &p.iph.saddr, 4); memcpy(dev->broadcast, &p.iph.daddr, 4); ipip6_tunnel_link(sitn, t); diff -ruw linux-3.6.7/net/ipv6/udp.c linux-3.6.7-fbx/net/ipv6/udp.c --- linux-3.6.7/net/ipv6/udp.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/ipv6/udp.c 2014-04-17 16:28:44.101689014 +0200 @@ -752,6 +752,60 @@ return 0; } +/* + * Note: called only from the BH handler context, + * so we don't need to lock the hashes. + */ +static int __udp6_lib_uc_conflict_deliver(struct net *net, struct sk_buff *skb, + const struct in6_addr *saddr, const struct in6_addr *daddr, + struct udp_table *udptable) +{ + struct sock *sk, *stack[256 / sizeof(struct sock *)]; + const struct udphdr *uh = udp_hdr(skb); + struct udp_hslot *hslot = udp_hashslot(udptable, net, ntohs(uh->dest)); + int dif; + unsigned int i, count = 0, non_dup_count = 0; + + spin_lock(&hslot->lock); + sk = sk_nulls_head(&hslot->head); + dif = inet6_iif(skb); + sk = udp_v6_mcast_next(net, sk, uh->dest, daddr, uh->source, saddr, dif); + while (sk) { + if (!sock_flag(sk, SOCK_UDP_DUP_UNICAST)) { + if (!non_dup_count) + stack[count++] = sk; + non_dup_count = 1; + } else + stack[count++] = sk; + + sk = udp_v6_mcast_next(net, sk_nulls_next(sk), uh->dest, daddr, + uh->source, saddr, dif); + if (unlikely(count == ARRAY_SIZE(stack))) { + if (!sk) + break; + flush_stack(stack, count, skb, ~0); + count = 0; + } + } + /* + * before releasing the lock, we must take reference on sockets + */ + for (i = 0; i < count; i++) + sock_hold(stack[i]); + + spin_unlock(&hslot->lock); + + if (count) { + flush_stack(stack, count, skb, count - 1); + + for (i = 0; i < count; i++) + sock_put(stack[i]); + } else { + kfree_skb(skb); + } + return 0; +} + static inline int udp6_csum_init(struct sk_buff *skb, struct udphdr *uh, int proto) { @@ -843,7 +897,16 @@ */ sk = __udp6_lib_lookup_skb(skb, uh->source, uh->dest, udptable); if (sk != NULL) { - int ret = udpv6_queue_rcv_skb(sk, skb); + int ret; + + if (sk->sk_reuse_conflict) { + sock_put(sk); + return __udp6_lib_uc_conflict_deliver(net, skb, + saddr, daddr, + udptable); + } + + ret = udpv6_queue_rcv_skb(sk, skb); sock_put(sk); /* a return value > 0 means to resubmit the input, but diff -ruw linux-3.6.7/net/Kconfig linux-3.6.7-fbx/net/Kconfig --- linux-3.6.7/net/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/Kconfig 2014-04-17 16:28:43.689681078 +0200 @@ -45,6 +45,18 @@ menu "Networking options" +config NETSKBPAD + int "Size reserved by dev_alloc_skb" + default 16 + +config NETRXTHREAD + bool "Do rx network processing in kernel thread" + +config NETRXTHREAD_RX_QUEUE + int "Number of rx queues" + default 1 + depends on NETRXTHREAD + source "net/packet/Kconfig" source "net/unix/Kconfig" source "net/xfrm/Kconfig" @@ -197,6 +209,8 @@ source "net/tipc/Kconfig" source "net/atm/Kconfig" source "net/l2tp/Kconfig" +source "net/fbxatm/Kconfig" +source "net/fbxbridge/Kconfig" source "net/802/Kconfig" source "net/bridge/Kconfig" source "net/dsa/Kconfig" diff -ruw linux-3.6.7/net/Makefile linux-3.6.7-fbx/net/Makefile --- linux-3.6.7/net/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/Makefile 2014-04-17 16:28:43.689681078 +0200 @@ -39,6 +39,12 @@ obj-$(CONFIG_AF_RXRPC) += rxrpc/ obj-$(CONFIG_ATM) += atm/ obj-$(CONFIG_L2TP) += l2tp/ +ifneq ($(CONFIG_FBXATM),) +obj-y += fbxatm/ +endif +ifneq ($(CONFIG_FBXBRIDGE),) +obj-y += fbxbridge/ +endif obj-$(CONFIG_DECNET) += decnet/ obj-$(CONFIG_PHONET) += phonet/ ifneq ($(CONFIG_VLAN_8021Q),) diff -ruw linux-3.6.7/net/netfilter/core.c linux-3.6.7-fbx/net/netfilter/core.c --- linux-3.6.7/net/netfilter/core.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/netfilter/core.c 2014-04-17 16:28:44.281692481 +0200 @@ -162,7 +162,7 @@ } return NF_ACCEPT; } - +EXPORT_SYMBOL(nf_iterate); /* Returns 1 if okfn() needs to be executed by the caller, * -EPERM for NF_DROP, 0 otherwise. */ diff -ruw linux-3.6.7/net/netfilter/nf_conntrack_core.c linux-3.6.7-fbx/net/netfilter/nf_conntrack_core.c --- linux-3.6.7/net/netfilter/nf_conntrack_core.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/netfilter/nf_conntrack_core.c 2014-04-17 16:28:44.317693175 +0200 @@ -187,6 +187,10 @@ nf_ct_remove_expectations(ct); } +#ifdef CONFIG_IP_FFN +extern void ip_ffn_ct_destroy(struct nf_conn *ct); +#endif + static void destroy_conntrack(struct nf_conntrack *nfct) { @@ -198,6 +202,10 @@ NF_CT_ASSERT(atomic_read(&nfct->use) == 0); NF_CT_ASSERT(!timer_pending(&ct->timeout)); +#ifdef CONFIG_IP_FFN + ip_ffn_ct_destroy(ct); +#endif + /* To make sure we don't get any weird locking issues here: * destroy_conntrack() MUST NOT be called with a write lock * to nf_conntrack_lock!!! -HW */ diff -ruw linux-3.6.7/net/netfilter/nf_conntrack_ftp.c linux-3.6.7-fbx/net/netfilter/nf_conntrack_ftp.c --- linux-3.6.7/net/netfilter/nf_conntrack_ftp.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/netfilter/nf_conntrack_ftp.c 2014-04-17 16:28:44.317693175 +0200 @@ -26,6 +26,11 @@ #include #include +#if defined(CONFIG_FREEBOX_BRIDGE) || defined(CONFIG_FREEBOX_BRIDGE_MODULE) +#include +#include +#endif + MODULE_LICENSE("GPL"); MODULE_AUTHOR("Rusty Russell "); MODULE_DESCRIPTION("ftp connection tracking helper"); @@ -373,6 +378,17 @@ return NF_ACCEPT; } +#if defined(CONFIG_FREEBOX_BRIDGE) || defined(CONFIG_FREEBOX_BRIDGE_MODULE) + if (!ct_ftp_info->is_fbxbridge && skb->dev->fbx_bridge) { + struct fbxbridge *fbxbr; + + fbxbr = skb->dev->fbx_bridge; + ct_ftp_info->is_fbxbridge = 1; + ct_ftp_info->fbxbridge_remote = ntohl(fbxbr->br_remote_ipaddr); + ct_ftp_info->fbxbridge_wan = fbxbr->wan_ipaddr; + } +#endif + th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph); if (th == NULL) return NF_ACCEPT; @@ -451,6 +467,50 @@ * Doesn't matter unless NAT is happening. */ daddr = &ct->tuplehash[!dir].tuple.dst.u3; +#if defined(CONFIG_FREEBOX_BRIDGE) || defined(CONFIG_FREEBOX_BRIDGE_MODULE) + if (ct_ftp_info->is_fbxbridge && + search[dir][i].ftptype == NF_CT_FTP_PORT) { + unsigned long orig_ip_addr; + unsigned short orig_port; + char buffer[sizeof("nnn,nnn,nnn,nnn,nnn,nnn")]; + unsigned int len; + __be32 addr; + + /* kludge: if we are here, then this is a local pkt + * that has gone through internal fbxbridge snat. + * + * If we see a port command, then we mangle packet to + * change ip address given to the remote bridge + * address */ + + /* check address is packet is the one fbxbridge + * changed */ + orig_ip_addr = cmd.u3.ip; + if (orig_ip_addr != ct_ftp_info->fbxbridge_wan) + goto donttouch; + + /* now mangle the remote address */ + orig_port = cmd.u.tcp.port; + addr = ct_ftp_info->fbxbridge_remote; + len = sprintf(buffer, "%u,%u,%u,%u,%u,%u", + ((unsigned char *)&addr)[0], + ((unsigned char *)&addr)[1], + ((unsigned char *)&addr)[2], + ((unsigned char *)&addr)[3], + orig_port >> 8 , orig_port & 0xFF); + + nf_nat_mangle_tcp_packet(skb, ct, ctinfo, matchoff, + matchlen, buffer, len); + + /* then adjust as if nothing happened */ + matchlen = len; + cmd.u3.ip = ct_ftp_info->fbxbridge_remote; + } +donttouch: + +#endif + + /* Update the ftp info */ if ((cmd.l3num == nf_ct_l3num(ct)) && memcmp(&cmd.u3.all, &ct->tuplehash[dir].tuple.src.u3.all, diff -ruw linux-3.6.7/net/netfilter/nf_conntrack_proto_tcp.c linux-3.6.7-fbx/net/netfilter/nf_conntrack_proto_tcp.c --- linux-3.6.7/net/netfilter/nf_conntrack_proto_tcp.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/netfilter/nf_conntrack_proto_tcp.c 2014-04-17 16:28:44.321693252 +0200 @@ -1056,6 +1056,18 @@ return NF_ACCEPT; } +#ifdef CONFIG_IP_FFN +int external_tcpv4_packet(struct nf_conn *ct, + const struct sk_buff *skb, + unsigned int dataoff, + enum ip_conntrack_info ctinfo) +{ + return tcp_packet(ct, skb, dataoff, ctinfo, AF_INET, 0, + tcp_get_timeouts(nf_ct_net(ct))); +} +#endif + + /* Called when a new connection for this protocol found. */ static bool tcp_new(struct nf_conn *ct, const struct sk_buff *skb, unsigned int dataoff, unsigned int *timeouts) diff -ruw linux-3.6.7/net/netfilter/nf_conntrack_proto_udp.c linux-3.6.7-fbx/net/netfilter/nf_conntrack_proto_udp.c --- linux-3.6.7/net/netfilter/nf_conntrack_proto_udp.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/netfilter/nf_conntrack_proto_udp.c 2014-04-17 16:28:44.321693252 +0200 @@ -99,6 +99,17 @@ return NF_ACCEPT; } +#ifdef CONFIG_IP_FFN +int external_udpv4_packet(struct nf_conn *ct, + const struct sk_buff *skb, + unsigned int dataoff, + enum ip_conntrack_info ctinfo) +{ + return udp_packet(ct, skb, dataoff, ctinfo, AF_INET, 0, + udp_get_timeouts(nf_ct_net(ct))); +} +#endif + /* Called when a new connection for this protocol found. */ static bool udp_new(struct nf_conn *ct, const struct sk_buff *skb, unsigned int dataoff, unsigned int *timeouts) diff -ruw linux-3.6.7/net/netfilter/xt_owner.c linux-3.6.7-fbx/net/netfilter/xt_owner.c --- linux-3.6.7/net/netfilter/xt_owner.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/netfilter/xt_owner.c 2014-04-17 16:28:44.325693328 +0200 @@ -17,6 +17,62 @@ #include #include +static int __owner_match_simple_gid(gid_t gid, + const struct xt_owner_match_info *info) +{ + if (gid >= info->gid_min && gid <= info->gid_max) + return 1; + return 0; +} + +/* + * see kernel/groups.c:groups_to_user() function, which inspired the + * content of this function. + */ +static int __owner_match_gid_groupinfo(const struct group_info *group_info, + const struct xt_owner_match_info *info) +{ + unsigned int count = group_info->ngroups; + unsigned int block; + + for (block = 0; block < group_info->nblocks; ++block) { + unsigned int cp_count = min(NGROUPS_PER_BLOCK, count); + unsigned int i; + + for (i = 0; i < cp_count; ++i) { + if (__owner_match_simple_gid( + group_info->blocks[block][i], + info)) { + return 1; + } + count -= cp_count; + } + } + return 0; +} + +static int owner_match_gid(const struct file *filp, + const struct xt_owner_match_info *info) +{ + struct task_struct *p; + + /* + * direct match, this is the simple and only case handled by + * the old code, file fsgid matches info gid range. + */ + if (__owner_match_simple_gid(filp->f_cred->fsgid, info)) + return 1; + + /* + * otherwise we need to have a look to the group list available + * in f_cred->group_info. + */ + if (__owner_match_gid_groupinfo(filp->f_cred->group_info, info)) + return 1; + + return 0; +} + static bool owner_mt(const struct sk_buff *skb, struct xt_action_param *par) { @@ -44,8 +100,7 @@ return false; if (info->match & XT_OWNER_GID) - if ((filp->f_cred->fsgid >= info->gid_min && - filp->f_cred->fsgid <= info->gid_max) ^ + if (owner_match_gid(filp, info) ^ !(info->invert & XT_OWNER_GID)) return false; diff -ruw linux-3.6.7/net/sched/sch_api.c linux-3.6.7-fbx/net/sched/sch_api.c --- linux-3.6.7/net/sched/sch_api.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/sched/sch_api.c 2014-04-17 16:28:44.405694870 +0200 @@ -834,6 +834,8 @@ goto err_out3; } lockdep_set_class(qdisc_lock(sch), &qdisc_tx_lock); + if (!netif_is_multiqueue(dev)) + sch->flags |= TCQ_F_ONETXQUEUE; } sch->handle = handle; diff -ruw linux-3.6.7/net/sched/sch_drr.c linux-3.6.7-fbx/net/sched/sch_drr.c --- linux-3.6.7/net/sched/sch_drr.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/sched/sch_drr.c 2014-04-17 16:28:44.409694946 +0200 @@ -345,7 +345,9 @@ cl = drr_find_class(sch, res.classid); return cl; } - return NULL; + + /* default to first minor if it exists, or drop */ + return drr_find_class(sch, TC_H_MAKE(TC_H_MAJ(sch->handle), 1)); } static int drr_enqueue(struct sk_buff *skb, struct Qdisc *sch) diff -ruw linux-3.6.7/net/sched/sch_generic.c linux-3.6.7-fbx/net/sched/sch_generic.c --- linux-3.6.7/net/sched/sch_generic.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/sched/sch_generic.c 2014-04-17 16:28:44.409694946 +0200 @@ -53,19 +53,18 @@ static inline struct sk_buff *dequeue_skb(struct Qdisc *q) { struct sk_buff *skb = q->gso_skb; + const struct netdev_queue *txq = q->dev_queue; if (unlikely(skb)) { - struct net_device *dev = qdisc_dev(q); - struct netdev_queue *txq; - /* check the reason of requeuing without tx lock first */ - txq = netdev_get_tx_queue(dev, skb_get_queue_mapping(skb)); + txq = netdev_get_tx_queue(txq->dev, skb_get_queue_mapping(skb)); if (!netif_xmit_frozen_or_stopped(txq)) { q->gso_skb = NULL; q->q.qlen--; } else skb = NULL; } else { + if (!(q->flags & TCQ_F_ONETXQUEUE) || !netif_xmit_frozen_or_stopped(txq)) skb = q->dequeue(q); } @@ -697,6 +696,8 @@ netdev_info(dev, "activation failed\n"); return; } + if (!netif_is_multiqueue(dev)) + qdisc->flags |= TCQ_F_ONETXQUEUE; } dev_queue->qdisc_sleeping = qdisc; } diff -ruw linux-3.6.7/net/sched/sch_mq.c linux-3.6.7-fbx/net/sched/sch_mq.c --- linux-3.6.7/net/sched/sch_mq.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/sched/sch_mq.c 2013-08-28 11:43:12.204376010 +0200 @@ -63,6 +63,7 @@ if (qdisc == NULL) goto err; priv->qdiscs[ntx] = qdisc; + qdisc->flags |= TCQ_F_ONETXQUEUE; } sch->flags |= TCQ_F_MQROOT; @@ -150,7 +151,8 @@ dev_deactivate(dev); *old = dev_graft_qdisc(dev_queue, new); - + if (new) + new->flags |= TCQ_F_ONETXQUEUE; if (dev->flags & IFF_UP) dev_activate(dev); return 0; diff -ruw linux-3.6.7/net/socket.c linux-3.6.7-fbx/net/socket.c --- linux-3.6.7/net/socket.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/socket.c 2014-04-17 16:28:44.461695948 +0200 @@ -984,6 +984,31 @@ return err; } +static DEFINE_MUTEX(fbxdiverter_ioctl_mutex); +static int (*fbxdiverter_ioctl_hook) (struct net *, unsigned int cmd, void __user *arg) = NULL; + +void fbxdiverter_ioctl_set(int (*hook) (struct net *, unsigned int, + void __user *)) +{ + mutex_lock(&fbxdiverter_ioctl_mutex); + fbxdiverter_ioctl_hook = hook; + mutex_unlock(&fbxdiverter_ioctl_mutex); +} + +EXPORT_SYMBOL(fbxdiverter_ioctl_set); + +static DEFINE_MUTEX(fbxbridge_ioctl_mutex); +static int (*fbxbridge_ioctl_hook)(struct net *, unsigned int cmd, void __user *arg) = NULL; + +void fbxbridge_set(int (*hook)(struct net *, unsigned int, void __user *)) +{ + mutex_lock(&fbxbridge_ioctl_mutex); + fbxbridge_ioctl_hook = hook; + mutex_unlock(&fbxbridge_ioctl_mutex); +} + +EXPORT_SYMBOL(fbxbridge_set); + /* * With an ioctl, arg may well be a user mode pointer, but we don't know * what to do with it - that's up to the protocol still. @@ -1056,6 +1081,28 @@ err = dlci_ioctl_hook(cmd, argp); mutex_unlock(&dlci_ioctl_mutex); break; + case SIOCGFBXDIVERT: + case SIOCSFBXDIVERT: + err = -ENOPKG; + if (!fbxdiverter_ioctl_hook) + request_module("fbxdiverter"); + + mutex_lock(&fbxdiverter_ioctl_mutex); + if (fbxdiverter_ioctl_hook) + err = fbxdiverter_ioctl_hook(net, cmd, argp); + mutex_unlock(&fbxdiverter_ioctl_mutex); + break; + case SIOCGFBXBRIDGE: + case SIOCSFBXBRIDGE: + err = -ENOPKG; + if (!fbxbridge_ioctl_hook) + request_module("fbxbridge"); + + mutex_lock(&fbxbridge_ioctl_mutex); + if (fbxbridge_ioctl_hook) + err = fbxbridge_ioctl_hook(net, cmd, argp); + mutex_unlock(&fbxbridge_ioctl_mutex); + break; default: err = sock_do_ioctl(net, sock, cmd, arg); break; diff -ruw linux-3.6.7/net/wireless/db.txt linux-3.6.7-fbx/net/wireless/db.txt --- linux-3.6.7/net/wireless/db.txt 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/net/wireless/db.txt 2014-04-17 16:28:44.529697258 +0200 @@ -1,17 +1,655 @@ -# -# This file is a placeholder to prevent accidental build breakage if someone -# enables CONFIG_CFG80211_INTERNAL_REGDB. Almost no one actually needs to -# enable that build option. -# -# You should be using CRDA instead. It is even better if you use the CRDA -# package provided by your distribution, since they will probably keep it -# up-to-date on your behalf. -# -# If you _really_ intend to use CONFIG_CFG80211_INTERNAL_REGDB then you will -# need to replace this file with one containing appropriately formatted -# regulatory rules that cover the regulatory domains you will be using. Your -# best option is to extract the db.txt file from the wireless-regdb git -# repository: -# -# git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-regdb.git -# +# This is the world regulatory domain +country 00: + (2402 - 2472 @ 40), (3, 20) + # Channel 12 - 13. No HT40 channel fits here + (2457 - 2482 @ 20), (3, 20), PASSIVE-SCAN, NO-IBSS + # Channel 14. Only JP enables this and for 802.11b only + (2474 - 2494 @ 20), (3, 20), PASSIVE-SCAN, NO-IBSS, NO-OFDM + # Channel 36 - 48 + (5170 - 5250 @ 40), (3, 20), PASSIVE-SCAN, NO-IBSS + # NB: 5260 MHz - 5700 MHz requies DFS + # Channel 149 - 165 + (5735 - 5835 @ 40), (3, 20), PASSIVE-SCAN, NO-IBSS + + +country AE: + (2402 - 2482 @ 40), (N/A, 20) + +country AL: + (2402 - 2482 @ 20), (N/A, 20) + +country AM: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (N/A, 18) + (5250 - 5330 @ 20), (N/A, 18), DFS + +country AN: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country AR: + (2402 - 2482 @ 20), (N/A, 20) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) + +country AT: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country AU: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (3, 23) + (5250 - 5330 @ 40), (3, 23), DFS + (5735 - 5835 @ 40), (3, 30) + +country AW: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country AZ: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 18) + (5250 - 5330 @ 40), (N/A, 18), DFS + +country BA: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country BB: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (3, 23) + (5250 - 5330 @ 40), (3, 23), DFS + (5735 - 5835 @ 40), (3, 30) + +country BE: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country BG: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 23) + (5250 - 5290 @ 40), (N/A, 23), DFS + (5490 - 5710 @ 40), (N/A, 30), DFS + +country BH: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (N/A, 20) + (5250 - 5330 @ 20), (N/A, 20), DFS + (5735 - 5835 @ 20), (N/A, 20) + +country BL: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 18) + (5250 - 5330 @ 40), (N/A, 18), DFS + +country BN: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5735 - 5835 @ 40), (N/A, 30) + +country BO: + (2402 - 2482 @ 40), (N/A, 30) + (5735 - 5835 @ 40), (N/A, 30) + +country BR: + (2402 - 2482 @ 20), (N/A, 20) + (5170 - 5250 @ 20), (3, 17) + (5250 - 5330 @ 20), (3, 20), DFS + (5490 - 5710 @ 20), (3, 20), DFS + (5735 - 5835 @ 20), (3, 30) + +country BY: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country BZ: + (2402 - 2482 @ 40), (N/A, 30) + (5735 - 5835 @ 40), (N/A, 30) + +country CA: + (2402 - 2472 @ 40), (3, 27) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) + +country CH: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country CL: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5735 - 5835 @ 40), (N/A, 20) + +country CN: + (2402 - 2482 @ 40), (N/A, 20) + (5735 - 5835 @ 40), (N/A, 30) + +country CO: + (2402 - 2472 @ 40), (3, 27) + (5170 - 5250 @ 20), (3, 17) + (5250 - 5330 @ 20), (3, 23), DFS + (5735 - 5835 @ 20), (3, 30) + +country CR: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (3, 17) + (5250 - 5330 @ 20), (3, 23), DFS + (5735 - 5835 @ 20), (3, 30) + +country CS: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country CY: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +# Data from http://www.ctu.eu/164/download/VOR/VOR-12-08-2005-34.pdf +# and http://www.ctu.eu/164/download/VOR/VOR-12-05-2007-6-AN.pdf +country CZ: + (2400 - 2483.5 @ 40), (N/A, 100 mW) + (5150 - 5250 @ 40), (N/A, 200 mW), NO-OUTDOOR + (5250 - 5350 @ 40), (N/A, 200 mW), NO-OUTDOOR, DFS + (5470 - 5725 @ 40), (N/A, 1000 mW), DFS + +# Data from "Frequenznutzungsplan" (as published in April 2008), +# downloaded from http://www.bundesnetzagentur.de/media/archive/13358.pdf +# Also applicable is http://www.bundesnetzagentur.de/media/archive/5009.pdf +# On the 5 GHz ranges TX power can be doubled if TPC is implemented. +country DE: + # entries 279004 and 280006 + (2400 - 2483.5 @ 40), (N/A, 100 mW) + # entries 303005, 304002 and 305002 + (5150 - 5350 @ 40), (N/A, 100 mW), NO-OUTDOOR, DFS + # entries 308002, 309001 and 310003 + (5470 - 5725 @ 40), (N/A, 500 mW), NO-OUTDOOR, DFS + +country DK: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country DO: + (2402 - 2472 @ 40), (3, 27) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 23), DFS + (5735 - 5835 @ 40), (3, 30) + +country DZ: + (2402 - 2482 @ 20), (N/A, 20) + +country EC: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (3, 17) + (5250 - 5330 @ 20), (3, 23), DFS + (5735 - 5835 @ 20), (3, 30) + +country EE: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country EG: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (N/A, 20) + (5250 - 5330 @ 20), (N/A, 20), DFS + +country ES: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country FI: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country FR: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country GE: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 18) + (5250 - 5330 @ 40), (N/A, 18), DFS + +country GB: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country GD: + (2402 - 2472 @ 40), (3, 27) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) + +country GR: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country GL: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (N/A, 20) + (5250 - 5330 @ 20), (N/A, 20), DFS + (5490 - 5710 @ 20), (N/A, 27), DFS + +country GT: + (2402 - 2472 @ 40), (3, 27) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 23), DFS + (5735 - 5835 @ 40), (3, 30) + +country GU: + (2402 - 2472 @ 40), (3, 27) + (5170 - 5250 @ 20), (3, 17) + (5250 - 5330 @ 20), (3, 23), DFS + (5735 - 5835 @ 20), (3, 30) + +country HN: + (2402 - 2482 @ 40), (N/A, 20) + +country HK: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) + +country HR: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country HT: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country HU: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country ID: + (2402 - 2482 @ 40), (N/A, 20) + +country IE: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country IL: + (2402 - 2482 @ 40), (N/A, 20) + +country IN: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (N/A, 20) + (5250 - 5330 @ 20), (N/A, 20), DFS + (5735 - 5835 @ 20), (N/A, 20) + +country IS: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country IR: + (2402 - 2482 @ 40), (N/A, 20) + (5735 - 5835 @ 40), (N/A, 30) + +country IT: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country JM: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) + +country JP: + (2402 - 2472 @ 40), (N/A, 20) + (2457 - 2482 @ 20), (N/A, 20) + (2474 - 2494 @ 20), (N/A, 20), NO-OFDM + (4910 - 4930 @ 10), (N/A, 23) + (4910 - 4990 @ 40), (N/A, 23) + (4930 - 4950 @ 10), (N/A, 23) + (5030 - 5045 @ 10), (N/A, 23) + (5030 - 5090 @ 40), (N/A, 23) + (5050 - 5060 @ 10), (N/A, 23) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 23), DFS + +country JO: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 18) + +country KH: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country KP: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5330 @ 40), (3, 20) + (5160 - 5250 @ 40), (3, 20), DFS + (5490 - 5630 @ 40), (3, 30), DFS + (5735 - 5815 @ 40), (3, 30) + +country KR: + (2402 - 2482 @ 20), (N/A, 20) + (5170 - 5250 @ 20), (3, 20) + (5250 - 5330 @ 20), (3, 20), DFS + (5490 - 5630 @ 20), (3, 30), DFS + (5735 - 5815 @ 20), (3, 30) + +country KW: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + +country KZ: + (2402 - 2482 @ 40), (N/A, 20) + +country LB: + (2402 - 2482 @ 40), (N/A, 20) + +country LI: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country LK: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (3, 17) + (5250 - 5330 @ 20), (3, 20), DFS + (5490 - 5710 @ 20), (3, 20), DFS + (5735 - 5835 @ 20), (3, 30) + +country LT: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country LU: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country LV: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country MC: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 18) + (5250 - 5330 @ 40), (N/A, 18), DFS + +country MA: + (2402 - 2482 @ 40), (N/A, 20) + +country MO: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (3, 23) + (5250 - 5330 @ 40), (3, 23), DFS + (5735 - 5835 @ 40), (3, 30) + +country MK: + (2402 - 2482 @ 40), (N/A, 20) + +country MT: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country MY: + (2402 - 2482 @ 20), (N/A, 20) + (5250 - 5330 @ 20), (N/A, 30), DFS + (5735 - 5835 @ 20), (N/A, 30) + +country MX: + (2402 - 2472 @ 40), (3, 27) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 23), DFS + (5735 - 5835 @ 40), (3, 30) + +country NL: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country NO: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country NP: + (2402 - 2482 @ 40), (N/A, 20) + (5735 - 5835 @ 40), (N/A, 30) + +country NZ: + (2402 - 2482 @ 40), (N/A, 30) + (5170 - 5250 @ 20), (3, 23) + (5250 - 5330 @ 20), (3, 23), DFS + (5735 - 5835 @ 20), (3, 30) + +country OM: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) + +country PA: + (2402 - 2472 @ 40), (3, 27) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 23), DFS + (5735 - 5835 @ 40), (3, 30) + +country PE: + (2402 - 2482 @ 40), (N/A, 20) + (5735 - 5835 @ 20), (N/A, 30) + +country PG: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 23), DFS + (5735 - 5835 @ 40), (3, 30) + +country PH: + (2402 - 2482 @ 40), (N/A, 20) + (5735 - 5835 @ 40), (N/A, 30) + +country PK: + (2402 - 2482 @ 40), (N/A, 20) + +country PL: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country PT: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country PR: + (2402 - 2472 @ 40), (3, 27) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 23), DFS + (5735 - 5835 @ 40), (3, 30) + +country QA: + (2402 - 2482 @ 40), (N/A, 20) + (5735 - 5835 @ 40), (N/A, 30) + +country RO: + (2402 - 2482 @ 40), (N/A, 20) + +country RU: + (2402 - 2482 @ 40), (N/A, 20) + +country SA: + (2402 - 2482 @ 40), (N/A, 20) + +country SE: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country SG: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5735 - 5835 @ 40), (N/A, 20) + +country SI: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country SK: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (N/A, 20) + (5250 - 5330 @ 40), (N/A, 20), DFS + (5490 - 5710 @ 40), (N/A, 27), DFS + +country SV: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (3, 17) + (5250 - 5330 @ 20), (3, 23), DFS + (5735 - 5835 @ 20), (3, 30) + +country SY: + (2402 - 2482 @ 40), (N/A, 20) + +country TW: + (2402 - 2472 @ 40), (3, 27) + (5270 - 5330 @ 40), (3, 17), DFS + (5735 - 5815 @ 40), (3, 30) + +country TH: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) + +country TT: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) + +country TN: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (N/A, 20) + (5250 - 5330 @ 20), (N/A, 20), DFS + +country TR: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (N/A, 20) + (5250 - 5330 @ 20), (N/A, 20), DFS + +country UA: + (2402 - 2482 @ 40), (N/A, 20) + +country US: + (2402 - 2472 @ 40), (3, 27) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5600 @ 40), (3, 20), DFS + (5650 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) + +country UY: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) + +country UZ: + (2402 - 2472 @ 40), (3, 27) + (5170 - 5250 @ 40), (3, 17) + (5250 - 5330 @ 40), (3, 20), DFS + (5490 - 5710 @ 40), (3, 20), DFS + (5735 - 5835 @ 40), (3, 30) + +country VE: + (2402 - 2482 @ 40), (N/A, 30) + (5735 - 5815 @ 20), (N/A, 23) + +country VN: + (2402 - 2482 @ 40), (N/A, 20) + +country YE: + (2402 - 2482 @ 40), (N/A, 20) + +country ZA: + (2402 - 2482 @ 40), (N/A, 20) + (5170 - 5250 @ 20), (3, 17) + (5250 - 5330 @ 20), (3, 20), DFS + (5490 - 5710 @ 20), (3, 20), DFS + (5735 - 5835 @ 20), (3, 30) + +country ZW: + (2402 - 2482 @ 40), (N/A, 20) + diff -ruw linux-3.6.7/scripts/dtc/Makefile linux-3.6.7-fbx/scripts/dtc/Makefile --- linux-3.6.7/scripts/dtc/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/scripts/dtc/Makefile 2013-08-28 11:43:29.956708695 +0200 @@ -27,3 +27,5 @@ # dependencies on generated files need to be listed explicitly $(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h +# generated files need to be cleaned explicitly +clean-files := dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h diff -ruw linux-3.6.7/security/Kconfig linux-3.6.7-fbx/security/Kconfig --- linux-3.6.7/security/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/security/Kconfig 2013-09-03 14:19:33.374106328 +0200 @@ -122,6 +122,7 @@ source security/tomoyo/Kconfig source security/apparmor/Kconfig source security/yama/Kconfig +source security/fbxlsmjail/Kconfig source security/integrity/Kconfig diff -ruw linux-3.6.7/security/Makefile linux-3.6.7-fbx/security/Makefile --- linux-3.6.7/security/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/security/Makefile 2013-09-03 14:19:33.374106328 +0200 @@ -8,6 +8,7 @@ subdir-$(CONFIG_SECURITY_TOMOYO) += tomoyo subdir-$(CONFIG_SECURITY_APPARMOR) += apparmor subdir-$(CONFIG_SECURITY_YAMA) += yama +subdir-$(CONFIG_SECURITY_FBXLSMJAIL) += fbxlsmjail # always enable default capabilities obj-y += commoncap.o @@ -23,6 +24,7 @@ obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o obj-$(CONFIG_SECURITY_APPARMOR) += apparmor/built-in.o obj-$(CONFIG_SECURITY_YAMA) += yama/built-in.o +obj-$(CONFIG_SECURITY_FBXLSMJAIL) += fbxlsmjail/built-in.o obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o # Object integrity file lists diff -ruw linux-3.6.7/sound/soc/codecs/cs42l52.c linux-3.6.7-fbx/sound/soc/codecs/cs42l52.c --- linux-3.6.7/sound/soc/codecs/cs42l52.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/sound/soc/codecs/cs42l52.c 2014-04-17 16:28:45.041707120 +0200 @@ -50,11 +50,6 @@ u8 mclksel; u32 mclk; u8 flags; -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) - struct input_dev *beep; - struct work_struct beep_work; - int beep_rate; -#endif }; static const struct reg_default cs42l52_reg_defaults[] = { @@ -87,7 +82,7 @@ { CS42L52_BEEP_VOL, 0x00 }, /* r1D Beep Volume off Time */ { CS42L52_BEEP_TONE_CTL, 0x00 }, /* r1E Beep Tone Cfg. */ { CS42L52_TONE_CTL, 0x00 }, /* r1F Tone Ctl */ - { CS42L52_MASTERA_VOL, 0x88 }, /* r20 Master A Volume */ + { CS42L52_MASTERA_VOL, 0x00 }, /* r20 Master A Volume */ { CS42L52_MASTERB_VOL, 0x00 }, /* r21 Master B Volume */ { CS42L52_HPA_VOL, 0x00 }, /* r22 Headphone A Volume */ { CS42L52_HPB_VOL, 0x00 }, /* r23 Headphone B Volume */ @@ -184,6 +179,8 @@ } } +static DECLARE_TLV_DB_SCALE(mst_tlv, -6000, 50, 0); + static DECLARE_TLV_DB_SCALE(hl_tlv, -10200, 50, 0); static DECLARE_TLV_DB_SCALE(hpd_tlv, -9600, 50, 1); @@ -194,6 +191,8 @@ static DECLARE_TLV_DB_SCALE(pga_tlv, -600, 50, 0); +static DECLARE_TLV_DB_SCALE(mix_tlv, -50, 50, 0); + static const unsigned int limiter_tlv[] = { TLV_DB_RANGE_HEAD(2), 0, 2, TLV_DB_SCALE_ITEM(-3000, 600, 0), @@ -226,7 +225,7 @@ }; static const struct soc_enum mic_bias_level_enum = - SOC_ENUM_SINGLE(CS42L52_IFACE_CTL1, 0, + SOC_ENUM_SINGLE(CS42L52_IFACE_CTL2, 0, ARRAY_SIZE(mic_bias_level_text), mic_bias_level_text); static const char * const cs42l52_mic_text[] = { "Single", "Differential" }; @@ -261,7 +260,7 @@ }; static const struct soc_enum hp_gain_enum = - SOC_ENUM_SINGLE(CS42L52_PB_CTL1, 4, + SOC_ENUM_SINGLE(CS42L52_PB_CTL1, 5, ARRAY_SIZE(hp_gain_num_text), hp_gain_num_text); static const char * const beep_pitch_text[] = { @@ -406,7 +405,7 @@ static const struct snd_kcontrol_new cs42l52_snd_controls[] = { SOC_DOUBLE_R_SX_TLV("Master Volume", CS42L52_MASTERA_VOL, - CS42L52_MASTERB_VOL, 0, 0x34, 0xE4, hl_tlv), + CS42L52_MASTERB_VOL, 0, 0x88, 0x90, mst_tlv), SOC_DOUBLE_R_SX_TLV("Headphone Volume", CS42L52_HPA_VOL, CS42L52_HPB_VOL, 0, 0x34, 0xCC, hpd_tlv), @@ -414,7 +413,7 @@ SOC_ENUM("Headphone Analog Gain", hp_gain_enum), SOC_DOUBLE_R_SX_TLV("Speaker Volume", CS42L52_SPKA_VOL, - CS42L52_SPKB_VOL, 7, 0x1, 0xff, hl_tlv), + CS42L52_SPKB_VOL, 0, 0x1, 0xff, hl_tlv), SOC_DOUBLE_R_SX_TLV("Bypass Volume", CS42L52_PASSTHRUA_VOL, CS42L52_PASSTHRUB_VOL, 6, 0x18, 0x90, pga_tlv), @@ -442,7 +441,7 @@ SOC_DOUBLE_R_SX_TLV("PCM Mixer Volume", CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL, - 6, 0x7f, 0x19, hl_tlv), + 0, 0x7f, 0x19, mix_tlv), SOC_DOUBLE_R("PCM Mixer Switch", CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL, 7, 1, 1), @@ -951,143 +950,6 @@ return 0; } -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) -static int beep_rates[] = { - 261, 522, 585, 667, 706, 774, 889, 1000, - 1043, 1200, 1333, 1412, 1600, 1714, 2000, 2182 -}; - -static void cs42l52_beep_work(struct work_struct *work) -{ - struct cs42l52_private *cs42l52 = - container_of(work, struct cs42l52_private, beep_work); - struct snd_soc_codec *codec = cs42l52->codec; - struct snd_soc_dapm_context *dapm = &codec->dapm; - int i; - int val = 0; - int best = 0; - - if (cs42l52->beep_rate) { - for (i = 0; i < ARRAY_SIZE(beep_rates); i++) { - if (abs(cs42l52->beep_rate - beep_rates[i]) < - abs(cs42l52->beep_rate - beep_rates[best])) - best = i; - } - - dev_dbg(codec->dev, "Set beep rate %dHz for requested %dHz\n", - beep_rates[best], cs42l52->beep_rate); - - val = (best << CS42L52_BEEP_RATE_SHIFT); - - snd_soc_dapm_enable_pin(dapm, "Beep"); - } else { - dev_dbg(codec->dev, "Disabling beep\n"); - snd_soc_dapm_disable_pin(dapm, "Beep"); - } - - snd_soc_update_bits(codec, CS42L52_BEEP_FREQ, - CS42L52_BEEP_RATE_MASK, val); - - snd_soc_dapm_sync(dapm); -} - -/* For usability define a way of injecting beep events for the device - - * many systems will not have a keyboard. - */ -static int cs42l52_beep_event(struct input_dev *dev, unsigned int type, - unsigned int code, int hz) -{ - struct snd_soc_codec *codec = input_get_drvdata(dev); - struct cs42l52_private *cs42l52 = snd_soc_codec_get_drvdata(codec); - - dev_dbg(codec->dev, "Beep event %x %x\n", code, hz); - - switch (code) { - case SND_BELL: - if (hz) - hz = 261; - case SND_TONE: - break; - default: - return -1; - } - - /* Kick the beep from a workqueue */ - cs42l52->beep_rate = hz; - schedule_work(&cs42l52->beep_work); - return 0; -} - -static ssize_t cs42l52_beep_set(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) -{ - struct cs42l52_private *cs42l52 = dev_get_drvdata(dev); - long int time; - int ret; - - ret = kstrtol(buf, 10, &time); - if (ret != 0) - return ret; - - input_event(cs42l52->beep, EV_SND, SND_TONE, time); - - return count; -} - -static DEVICE_ATTR(beep, 0200, NULL, cs42l52_beep_set); - -static void cs42l52_init_beep(struct snd_soc_codec *codec) -{ - struct cs42l52_private *cs42l52 = snd_soc_codec_get_drvdata(codec); - int ret; - - cs42l52->beep = input_allocate_device(); - if (!cs42l52->beep) { - dev_err(codec->dev, "Failed to allocate beep device\n"); - return; - } - - INIT_WORK(&cs42l52->beep_work, cs42l52_beep_work); - cs42l52->beep_rate = 0; - - cs42l52->beep->name = "CS42L52 Beep Generator"; - cs42l52->beep->phys = dev_name(codec->dev); - cs42l52->beep->id.bustype = BUS_I2C; - - cs42l52->beep->evbit[0] = BIT_MASK(EV_SND); - cs42l52->beep->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE); - cs42l52->beep->event = cs42l52_beep_event; - cs42l52->beep->dev.parent = codec->dev; - input_set_drvdata(cs42l52->beep, codec); - - ret = input_register_device(cs42l52->beep); - if (ret != 0) { - input_free_device(cs42l52->beep); - cs42l52->beep = NULL; - dev_err(codec->dev, "Failed to register beep device\n"); - } - - ret = device_create_file(codec->dev, &dev_attr_beep); - if (ret != 0) { - dev_err(codec->dev, "Failed to create keyclick file: %d\n", - ret); - } -} - -static void cs42l52_free_beep(struct snd_soc_codec *codec) -{ - struct cs42l52_private *cs42l52 = snd_soc_codec_get_drvdata(codec); - - device_remove_file(codec->dev, &dev_attr_beep); - input_unregister_device(cs42l52->beep); - cancel_work_sync(&cs42l52->beep_work); - cs42l52->beep = NULL; - - snd_soc_update_bits(codec, CS42L52_BEEP_TONE_CTL, - CS42L52_BEEP_EN_MASK, 0); -} -#else static void cs42l52_init_beep(struct snd_soc_codec *codec) { } @@ -1095,7 +957,6 @@ static void cs42l52_free_beep(struct snd_soc_codec *codec) { } -#endif static int cs42l52_probe(struct snd_soc_codec *codec) { diff -ruw linux-3.6.7/sound/soc/codecs/cs42l52.h linux-3.6.7-fbx/sound/soc/codecs/cs42l52.h --- linux-3.6.7/sound/soc/codecs/cs42l52.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/sound/soc/codecs/cs42l52.h 2014-04-17 16:28:45.041707120 +0200 @@ -157,7 +157,7 @@ #define CS42L52_PB_CTL1_INV_PCMA (1 << 2) #define CS42L52_PB_CTL1_MSTB_MUTE (1 << 1) #define CS42L52_PB_CTL1_MSTA_MUTE (1 << 0) -#define CS42L52_PB_CTL1_MUTE_MASK 0xFFFD +#define CS42L52_PB_CTL1_MUTE_MASK 0x03 #define CS42L52_PB_CTL1_MUTE 3 #define CS42L52_PB_CTL1_UNMUTE 0 diff -ruw linux-3.6.7/sound/soc/kirkwood/Kconfig linux-3.6.7-fbx/sound/soc/kirkwood/Kconfig --- linux-3.6.7/sound/soc/kirkwood/Kconfig 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/sound/soc/kirkwood/Kconfig 2013-09-03 14:19:33.374106328 +0200 @@ -28,3 +28,15 @@ Say Y if you want to add support for SoC audio on the HP t5325 thin client. + +config SND_KIRKWOOD_RD88F6282A + tristate "SoC Audio support for RD-88F6282-A" + depends on SND_KIRKWOOD_SOC && MACH_RD88F6282A + select SND_KIRKWOOD_SOC_I2S + select SND_SOC_CS42L51 + +config SND_KIRKWOOD_SOC_FBXGW2R + tristate "Soc Audio support for fbxgw2r" + depends on SND_KIRKWOOD_SOC && MACH_FBXGW2R && I2C + select SND_KIRKWOOD_SOC_I2S + select SND_SOC_CS42L52 diff -ruw linux-3.6.7/sound/soc/kirkwood/kirkwood-dma.c linux-3.6.7-fbx/sound/soc/kirkwood/kirkwood-dma.c --- linux-3.6.7/sound/soc/kirkwood/kirkwood-dma.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/sound/soc/kirkwood/kirkwood-dma.c 2014-04-17 16:28:45.117708584 +0200 @@ -178,7 +178,7 @@ } dram = mv_mbus_dram_info(); - addr = virt_to_phys(substream->dma_buffer.area); + addr = substream->dma_buffer.addr; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { prdata->play_stream = substream; kirkwood_dma_conf_mbus_windows(priv->io, @@ -244,6 +244,7 @@ struct snd_soc_dai *cpu_dai = soc_runtime->cpu_dai; struct kirkwood_dma_data *priv; unsigned long size, count; + unsigned long val; priv = snd_soc_dai_get_dma_data(cpu_dai, substream); @@ -252,16 +253,22 @@ size = (size>>2)-1; count = snd_pcm_lib_period_bytes(substream); + val = readl(priv->io + KIRKWOOD_SCNTR_CTL); + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { writel(count, priv->io + KIRKWOOD_PLAY_BYTE_INT_COUNT); writel(runtime->dma_addr, priv->io + KIRKWOOD_PLAY_BUF_ADDR); writel(size, priv->io + KIRKWOOD_PLAY_BUF_SIZE); + val |= KIRKWOOD_SCNTR_CTL_PLAY_CLEAR | + KIRKWOOD_SCNTR_CTL_PLAY_EN; } else { writel(count, priv->io + KIRKWOOD_REC_BYTE_INT_COUNT); writel(runtime->dma_addr, priv->io + KIRKWOOD_REC_BUF_ADDR); writel(size, priv->io + KIRKWOOD_REC_BUF_SIZE); + val |= KIRKWOOD_SCNTR_CTL_REC_CLEAR | + KIRKWOOD_SCNTR_CTL_REC_EN; } - + writel(val, priv->io + KIRKWOOD_SCNTR_CTL); return 0; } @@ -286,6 +293,35 @@ return count; } +static snd_pcm_sframes_t kirkwood_dma_delay(struct snd_pcm_substream *substream, + struct snd_soc_dai *codec_dai) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct snd_soc_pcm_runtime *soc_runtime = substream->private_data; + struct snd_soc_dai *cpu_dai = soc_runtime->cpu_dai; + struct kirkwood_dma_data *priv; + snd_pcm_sframes_t cur_pointer; + u32 real; + + priv = snd_soc_dai_get_dma_data(cpu_dai, substream); + + /* it sucks that we have to call pointer again, would be + * better if current one was given */ + cur_pointer = kirkwood_dma_pointer(substream); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + real = readl(priv->io + KIRKWOOD_PLAY_SCNTR); + else + real = readl(priv->io + KIRKWOOD_REC_SCNTR); + + real %= runtime->buffer_size; + + if (cur_pointer >= real) + return cur_pointer - real; + return runtime->buffer_size - real + cur_pointer - 1; + +} + struct snd_pcm_ops kirkwood_dma_ops = { .open = kirkwood_dma_open, .close = kirkwood_dma_close, @@ -365,6 +401,7 @@ static struct snd_soc_platform_driver kirkwood_soc_platform = { .ops = &kirkwood_dma_ops, + .delay = kirkwood_dma_delay, .pcm_new = kirkwood_dma_new, .pcm_free = kirkwood_dma_free_dma_buffers, }; diff -ruw linux-3.6.7/sound/soc/kirkwood/kirkwood.h linux-3.6.7-fbx/sound/soc/kirkwood/kirkwood.h --- linux-3.6.7/sound/soc/kirkwood/kirkwood.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/sound/soc/kirkwood/kirkwood.h 2014-04-17 16:28:45.117708584 +0200 @@ -74,6 +74,15 @@ #define KIRKWOOD_DCO_CTL_FREQ_12 (1<<0) #define KIRKWOOD_DCO_CTL_FREQ_24 (2<<0) +#define KIRKWOOD_SCNTR_CTL 0x1220 +#define KIRKWOOD_SCNTR_CTL_REC_EN (1 << 0) +#define KIRKWOOD_SCNTR_CTL_PLAY_EN (1 << 1) +#define KIRKWOOD_SCNTR_CTL_REC_CLEAR (1 << 8) +#define KIRKWOOD_SCNTR_CTL_PLAY_CLEAR (1 << 9) + +#define KIRKWOOD_PLAY_SCNTR 0x1224 +#define KIRKWOOD_REC_SCNTR 0x1228 + #define KIRKWOOD_DCO_SPCR_STATUS 0x120c #define KIRKWOOD_DCO_SPCR_STATUS_DCO_LOCK (1<<16) diff -ruw linux-3.6.7/sound/soc/kirkwood/Makefile linux-3.6.7-fbx/sound/soc/kirkwood/Makefile --- linux-3.6.7/sound/soc/kirkwood/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/sound/soc/kirkwood/Makefile 2013-09-03 14:19:33.374106328 +0200 @@ -6,6 +6,11 @@ snd-soc-openrd-objs := kirkwood-openrd.o snd-soc-t5325-objs := kirkwood-t5325.o +snd-soc-rd88f6282a-objs := kirkwood-rd88f6282a.o +snd-soc-fbxgw2r-objs := kirkwood-fbxgw2r.o obj-$(CONFIG_SND_KIRKWOOD_SOC_OPENRD) += snd-soc-openrd.o obj-$(CONFIG_SND_KIRKWOOD_SOC_T5325) += snd-soc-t5325.o + +obj-$(CONFIG_SND_KIRKWOOD_RD88F6282A) += snd-soc-rd88f6282a.o +obj-$(CONFIG_SND_KIRKWOOD_SOC_FBXGW2R) += snd-soc-fbxgw2r.o diff -ruw linux-3.6.7/sound/usb/card.h linux-3.6.7-fbx/sound/usb/card.h --- linux-3.6.7/sound/usb/card.h 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/sound/usb/card.h 2014-04-17 16:28:45.157709354 +0200 @@ -133,7 +133,7 @@ struct snd_pcm_hw_constraint_list rate_list; /* limited rates */ spinlock_t lock; - int last_frame_number; /* stored frame number */ + ktime_t last_frame_time; /* stored frame time */ int last_delay; /* stored delay */ }; diff -ruw linux-3.6.7/sound/usb/pcm.c linux-3.6.7-fbx/sound/usb/pcm.c --- linux-3.6.7/sound/usb/pcm.c 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/sound/usb/pcm.c 2014-04-17 16:28:45.161709432 +0200 @@ -42,21 +42,12 @@ snd_pcm_uframes_t snd_usb_pcm_delay(struct snd_usb_substream *subs, unsigned int rate) { - int current_frame_number; - int frame_diff; + unsigned int delta; int est_delay; - current_frame_number = usb_get_current_frame_number(subs->dev); - /* - * HCD implementations use different widths, use lower 8 bits. - * The delay will be managed up to 256ms, which is more than - * enough - */ - frame_diff = (current_frame_number - subs->last_frame_number) & 0xff; + delta = ktime_us_delta(ktime_get(), subs->last_frame_time); - /* Approximation based on number of samples per USB frame (ms), - some truncation for 44.1 but the estimate is good enough */ - est_delay = subs->last_delay - (frame_diff * rate / 1000); + est_delay = subs->last_delay - ((delta / 10 * rate) / 100000); if (est_delay < 0) est_delay = 0; return est_delay; @@ -573,7 +564,7 @@ subs->hwptr_done = 0; subs->transfer_done = 0; subs->last_delay = 0; - subs->last_frame_number = 0; + subs->last_frame_time = ktime_get(); runtime->delay = 0; /* for playback, submit the URBs now; otherwise, the first hwptr_done @@ -1136,9 +1127,8 @@ runtime->delay += frames; subs->last_delay = runtime->delay; - /* realign last_frame_number */ - subs->last_frame_number = usb_get_current_frame_number(subs->dev); - subs->last_frame_number &= 0xFF; /* keep 8 LSBs */ + /* record time */ + subs->last_frame_time = ktime_get(); spin_unlock_irqrestore(&subs->lock, flags); urb->transfer_buffer_length = bytes; @@ -1157,7 +1147,6 @@ struct snd_pcm_runtime *runtime = subs->pcm_substream->runtime; int stride = runtime->frame_bits >> 3; int processed = urb->transfer_buffer_length / stride; - int est_delay; /* ignore the delay accounting when procssed=0 is given, i.e. * silent payloads are procssed before handling the actual data @@ -1166,7 +1155,6 @@ return; spin_lock_irqsave(&subs->lock, flags); - est_delay = snd_usb_pcm_delay(subs, runtime->rate); /* update delay with exact number of samples played */ if (processed > subs->last_delay) subs->last_delay = 0; @@ -1174,15 +1162,6 @@ subs->last_delay -= processed; runtime->delay = subs->last_delay; - /* - * Report when delay estimate is off by more than 2ms. - * The error should be lower than 2ms since the estimate relies - * on two reads of a counter updated every ms. - */ - if (abs(est_delay - subs->last_delay) * 1000 > runtime->rate * 2) - snd_printk(KERN_DEBUG "delay: estimated %d, actual %d\n", - est_delay, subs->last_delay); - spin_unlock_irqrestore(&subs->lock, flags); } diff -ruw linux-3.6.7/usr/Makefile linux-3.6.7-fbx/usr/Makefile --- linux-3.6.7/usr/Makefile 2012-11-17 22:21:23.000000000 +0100 +++ linux-3.6.7-fbx/usr/Makefile 2013-09-03 14:19:33.374106328 +0200 @@ -46,8 +46,10 @@ # in initramfs and to detect if any files are added/removed. # Removed files are identified by directory timestamp being updated # The dependency list is generated by gen_initramfs.sh -l -ifneq ($(wildcard $(obj)/.initramfs_data.cpio.d),) - include $(obj)/.initramfs_data.cpio.d +ifneq ($(wildcard $(obj)/.initramfs_data.cpio$(suffix_y).d),) + include $(obj)/.initramfs_data.cpio$(suffix_y).d +else + deps_initramfs := FORCE endif quiet_cmd_initfs = GEN $@ @@ -64,6 +66,6 @@ # 3) If gen_init_cpio are newer than initramfs_data.cpio # 4) arguments to gen_initramfs.sh changes $(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs - $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d + $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio$(suffix_y).d $(call if_changed,initfs) --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/arch/arm/kernel/seccomp.c 2014-04-17 16:28:01.708872390 +0200 @@ -0,0 +1,11 @@ + +#include +#include +#include + +asmlinkage int __arm_secure_computing(int scno) +{ + current_thread_info()->syscall = scno; + + return __secure_computing(scno); +} --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/fbxgw1r-setup.c 2014-04-17 16:28:02.436886415 +0200 @@ -0,0 +1,699 @@ +/* + * Freebox GW01r + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "common.h" +#include "mpp.h" + +#define PFX "fbxgw1r: " + +#include "fbxgw-switch.h" +#include "fbxgw-common.h" + +/* + * set shift registers output to given value + */ +static void set_shift_register(u8 val) +{ + int i; + + gpio_set_value(GPIO_SR_CLK, 0); + gpio_set_value(GPIO_SR_LOAD, 0); + + udelay(1); + + for (i = 7; i >= 0; i--) { + gpio_set_value(GPIO_SR_DIN, (val & (1 << i)) ? 1 : 0); + udelay(1); + gpio_set_value(GPIO_SR_CLK, 1); + udelay(1); + gpio_set_value(GPIO_SR_CLK, 0); + } + + udelay(1); + gpio_set_value(GPIO_SR_LOAD, 1); + udelay(1); +} + +/* + * reset values can not be read back from shift registers, we have to + * keep them + */ +static DEFINE_SPINLOCK(sr_lock); +static unsigned long sr_value; + +/* + * clear or set sr bit + */ +static void sr_set_bit(int bit, int value) +{ + unsigned long flags; + + value = !!value; + spin_lock_irqsave(&sr_lock, flags); + sr_value &= ~(1 << bit); + sr_value |= (value << bit); + set_shift_register((u8)sr_value); + spin_unlock_irqrestore(&sr_lock, flags); +} + +/* + * return cached bit value + */ +static int sr_get_bit(int bit) +{ + return test_bit(bit, &sr_value); +} + +/* + * control PCIe bus reset + */ +static void fbxgw1r_pcie_reset(int value) +{ + sr_set_bit(SROUT_PCIE_RST, value); +} + +#ifdef CONFIG_MACH_FBXGW1R_ETHSW_CONFIG +/* + * control marvell swith reset + */ +static void fbxgw1r_marvell_switch_reset(int value) +{ + gpio_set_value(GPIO_SW_RESET, value); +} + +static int fbxgw1r_do_vlan(void) +{ +#ifdef CONFIG_MACH_FBXGW1R_ETHSW_CONFIG_VLAN + return 1; +#else + return 0; +#endif +} + +#define NFS_VLAN_ID 41 + +static int marvell_6161_config(struct net_device *dev, int probe, + int (*mii_read)(struct net_device *dev, + int phy_id, int reg), + void (*mii_write)(struct net_device *dev, + int phy_id, int reg, int val)) +{ + u16 val; + struct mii_struct mii = { + .dev = dev, + .read = mii_read, + .write = mii_write, + }; + + if (!probe) + return 0; + + /* switch needs more than 1 second (!) to go out of reset */ + fbxgw1r_marvell_switch_reset(0); + mdelay(1); + fbxgw1r_marvell_switch_reset(1); + msleep(2000); + + /* probe */ + val = mii.read(mii.dev, SWPORT(0), PORTREG_SWITCH_IDENTIFIER); + if (PRODUCT_NUM(val) != 0x161) { + printk(KERN_ERR PFX "unknown switch id: 0x%08x\n", + PRODUCT_NUM(val)); + return 1; + } + mii.dev_id = PRODUCT_NUM(val); + mii.indirect_phy_access = false; + + fbxgw_sw_config_cpu_port(&mii, SWPORT(5)); + fbxgw_sw_config_phy_port(&mii, PHYPORT(1)); + + + if (fbxgw1r_do_vlan()) { + const u8 config[6] = { + PDATA_NOT_MEMBER, + PDATA_MEMBER_UNTAGGED, + PDATA_NOT_MEMBER, + PDATA_NOT_MEMBER, + PDATA_NOT_MEMBER, + PDATA_MEMBER_TAGGED, + }; + + fbxgw_sw_vtu_load(&mii, NFS_VLAN_ID, config, sizeof (config)); + + fbxgw_sw_port_default_vid(&mii, SWPORT(1), NFS_VLAN_ID); + fbxgw_sw_port_dot1q_secure(&mii, SWPORT(1)); + fbxgw_sw_port_dot1q_secure(&mii, SWPORT(5)); + } + + fbxgw_sw_port_forward_enable(&mii, SWPORT(1)); + fbxgw_sw_port_forward_enable(&mii, SWPORT(5)); + + printk(KERN_INFO PFX "marvell 6161 initialized\n"); + return 0; +} +#endif + +#ifdef CONFIG_MACH_FBXGW1R_EXPANSION_BOARD_SETUP +static int fbxgw1r_expansion_board_setup(void) +{ + int plugged; + + plugged = !gpio_get_value(GPIO_EXP_PRESENCE); + if (!plugged) { + printk(KERN_INFO PFX "No expansion board plugged.\n"); + return 0; + } + + printk(KERN_INFO PFX "Expansion board plugged, powering up.\n"); + sr_set_bit(SROUT_EXP_PWREN, 1); + gpio_set_value(GPIO_EXP_RST, 1); + mdelay(1000); + +#if 0 + /* + * catch early powerfault conditions (pwrgood to zero could + * meand short circuits some where between the midplane and + * the expansion board and could damage the + * midplane/freebox/expansion board). + */ + if (gpio_get_value(GPIO_EXP_PWRGOOD) == 0) { + printk(KERN_WARNING PFX "Expansion power is not good, " + "disabling"); + sr_set_bit(SROUT_EXP_PWREN, 0); + gpio_set_value(GPIO_EXP_RST, 0); + return -ENXIO; + } +#endif + + printk(KERN_INFO PFX "Expansion powered up safely"); + return 0; +} +#endif + +static struct mv643xx_eth_platform_data fbxgw1r_ge00_data = { + .phy_addr = MV643XX_ETH_PHY_NONE, + .speed = SPEED_1000, + .duplex = DUPLEX_FULL, +#ifdef CONFIG_MACH_FBXGW1R_ETHSW_CONFIG + .mii_config = marvell_6161_config, +#endif +}; + +static struct mv643xx_eth_platform_data fbxgw1r_ge01_data = { + .phy_addr = MV643XX_ETH_PHY_NONE, + .speed = SPEED_1000, + .duplex = DUPLEX_FULL, +}; + +static const struct flash_platform_data flash_info = { + .name = "bcmflash", +}; + +static const struct ssd1327_platform_data ssd1327_pd = { + .data_select_gpio = GPIO_OLED_DATA_SELECT, + .width = 128, + .height = 128, + .rotate = 270, + .watchdog = 300, +}; + +static struct spi_board_info spi_board_info[] __initdata = { + + { + .modalias = "ssd1327", + .platform_data = &ssd1327_pd, + .mode = SPI_MODE_0, + .max_speed_hz = 10 * 1000 * 1000, + .bus_num = 0, + .chip_select = 0, + }, + + { + .modalias = "m25p80", + .platform_data = &flash_info, + .mode = SPI_MODE_0, + .max_speed_hz = 4 * 1000 * 1000, + .bus_num = 0, + .chip_select = 1, + }, +}; + +/* + * fbxgpio + */ +static struct fbxgpio_operations fbxgw1r_gpio_ops = { + /* cast only for signed/unsigned */ + .get_datain = (int (*)(int))gpio_get_value, + .get_dataout = (int (*)(int))gpio_get_value, + .set_dataout = (void (*)(int, int))gpio_set_value, +}; + +static struct fbxgpio_operations fbxgw1r_sr_ops = { + .get_dataout = sr_get_bit, + .set_dataout = sr_set_bit, +}; + +static struct fbxgpio_pin fbxgw1r_gpio_pins[] = { + /* marvell gpios */ + { + .pin_name = "oled-data-select", + .direction = GPIO_DIR_OUT, + .pin_num = GPIO_OLED_DATA_SELECT, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "test-mode", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_TEST_MODE, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "sfp-txdis", + .direction = GPIO_DIR_OUT, + .pin_num = GPIO_SFP_TXDIS, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "sw-reset", + .direction = GPIO_DIR_OUT, + .pin_num = GPIO_SW_RESET, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "sw-int", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_SW_INT, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "sfp-pwrgood", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_SFP_PWRGOOD, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "sfp-txfault", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_SFP_TXFAULT, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "sfp-presence", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_SFP_PRESENCE, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "sfp-rxloss", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_SFP_RXLOSS, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "exp-rst", + .direction = GPIO_DIR_OUT, + .pin_num = GPIO_EXP_RST, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "pos-sense", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_POS_SENSE, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "exp-pwrgood", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_EXP_PWRGOOD, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "exp-presence", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_EXP_PRESENCE, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "kp-int", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_KP_INT, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "board-id-0", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_BOARD_ID_0, + .ops = &fbxgw1r_gpio_ops, + }, + { + .pin_name = "board-id-1", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_BOARD_ID_1, + .ops = &fbxgw1r_gpio_ops, + }, + + /* shift registers resets */ + { + .pin_name = "sfp-pwren", + .direction = GPIO_DIR_OUT, + .pin_num = SROUT_SFP_PWREN, + .ops = &fbxgw1r_sr_ops, + }, + { + .pin_name = "usb-rst", + .direction = GPIO_DIR_OUT, + .pin_num = SROUT_USB_RST, + .ops = &fbxgw1r_sr_ops, + }, + { + .pin_name = "audio-rst", + .direction = GPIO_DIR_OUT, + .pin_num = SROUT_AUDIO_RST, + .ops = &fbxgw1r_sr_ops, + }, + { + .pin_name = "exp-pwren", + .direction = GPIO_DIR_OUT, + .pin_num = SROUT_EXP_PWREN, + .ops = &fbxgw1r_sr_ops, + }, + { + .pin_name = "bcm-rst", + .direction = GPIO_DIR_OUT, + .pin_num = SROUT_BCM_RST, + .ops = &fbxgw1r_sr_ops, + }, + { + .pin_name = "pcie-rst", + .direction = GPIO_DIR_OUT, + .pin_num = SROUT_PCIE_RST, + .ops = &fbxgw1r_sr_ops, + }, + { + .pin_name = "keypad-oled-rst", + .direction = GPIO_DIR_OUT, + .pin_num = SROUT_KEYPAD_OLED_RST, + .ops = &fbxgw1r_sr_ops, + }, + { + .pin_name = "keypad-pwren", + .direction = GPIO_DIR_OUT, + .pin_num = SROUT_OLED_PWREN, + .ops = &fbxgw1r_sr_ops, + }, + + + { }, +}; + +static struct platform_device fbxgw1r_gpio_device = { + .name = "fbxgpio", + .id = -1, + .dev = { + .platform_data = &fbxgw1r_gpio_pins, + }, +}; + +static unsigned int fbxgw1r_mpp_config[] __initdata = { + MPP0_NF_IO2, + MPP1_NF_IO3, + MPP2_NF_IO4, + MPP3_NF_IO5, + MPP4_NF_IO6, + MPP5_NF_IO7, + MPP6_SYSRST_OUTn, + MPP7_GPO, + MPP8_TW0_SDA, + MPP9_TW0_SCK, + MPP10_GPO, + MPP11_UART0_RXD, + MPP12_GPO, + MPP13_GPIO, + MPP14_GPIO, + MPP15_UART1_TXD, + MPP16_UART1_RXD, + MPP17_GPIO, + MPP18_NF_IO0, + MPP19_NF_IO1, + MPP20_GE1_TXD0, + MPP21_GE1_TXD1, + MPP22_GE1_TXD2, + MPP23_GE1_TXD3, + MPP24_GE1_RXD0, + MPP25_GE1_RXD1, + MPP26_GE1_RXD2, + MPP27_GE1_RXD3, + MPP28_GPIO, + MPP29_GPIO, + MPP30_GE1_RXCTL, + MPP31_GE1_RXCLK, + MPP32_GE1_TCLKOUT, + MPP33_GE1_TXCTL, + MPP34_GPIO, + MPP35_GPIO, + MPP36_GPIO, + MPP37_GPIO, + MPP38_GPIO, + MPP39_TDM_SPI_CS0, + MPP40_TDM_SPI_SCK, + MPP41_TDM_SPI_MISO, + MPP42_TDM_SPI_MOSI, + MPP43_GPIO, + MPP44_GPIO, + MPP45_GPIO, + MPP46_GPIO, + MPP47_GPIO, + MPP48_GPIO, + MPP49_GPIO, + 0, +}; + +/* + * i2c midplane eeprom. + */ +static struct at24_platform_data midplane_eeprom_data = { + .byte_len = 4096, + .page_size = 8, + .flags = AT24_FLAG_ADDR16, +}; + +/* + * expansion board eeprom. + */ +static struct at24_platform_data expansion_eeprom_data = { + .byte_len = 32768, + .page_size = 64, + .flags = AT24_FLAG_ADDR16, +}; + +/* + * i2c smsc + */ +static struct smsc_cap1066_pdata cap1066_pdata = { + .key_map = { + KEY_DOWN, + KEY_LEFT, + KEY_UP, + 0, + KEY_ENTER, + KEY_RIGHT, + }, + + .has_irq_gpio = true, + .irq_gpio = GPIO_KP_INT, +}; + +static struct i2c_board_info fbxgw1r_i2c_devs[] = { + { + .type = "cap1066", + .addr = 0x28, + .platform_data = &cap1066_pdata, + }, + { + .type = "24c32", + .addr = 0x57, + .platform_data = &midplane_eeprom_data, + }, + { + .type = "24c256", + .addr = 0x53, + .platform_data = &expansion_eeprom_data, + }, +}; + +void __init fbxgw1r_init(void) +{ + const struct fbx_serial *serial; + int tdm_cs_gpio[2]; + extern int panic_timeout; + unsigned int n; + + panic_timeout = 10; + panic_on_oops = 1; + + /* setup gpio */ + kirkwood_mpp_conf(fbxgw1r_mpp_config); + + gpio_request(GPIO_OLED_DATA_SELECT, "oled-data-select"); + gpio_request(GPIO_SR_CLK, "sr-clk"); + gpio_request(GPIO_SR_DIN, "sr-din"); + gpio_request(GPIO_TEST_MODE, "test-mode"); + gpio_request(GPIO_SFP_TXDIS, "sfp-txdis"); + gpio_request(GPIO_SR_LOAD, "sr-load"); + gpio_request(GPIO_SW_RESET, "sw-reset"); + gpio_request(GPIO_SW_INT, "sw-int"); + gpio_request(GPIO_SFP_PWRGOOD, "sfp-pwrgood"); + gpio_request(GPIO_SFP_TXFAULT, "sfp-txfault"); + gpio_request(GPIO_SPI_CS_BCM, "spi-cs-bcm"); + gpio_request(GPIO_SFP_PRESENCE, "sfp-presence"); + gpio_request(GPIO_SFP_RXLOSS, "sfp-rxloss"); + gpio_request(GPIO_EXP_RST, "exp-rst"); + gpio_request(GPIO_POS_SENSE, "pos-sense"); + gpio_request(GPIO_EXP_PWRGOOD, "exp-pwrgood"); + gpio_request(GPIO_EXP_PRESENCE, "exp-presence"); + gpio_request(GPIO_KP_INT, "kp-int"); + gpio_request(GPIO_BOARD_ID_0, "board-id-0"); + gpio_request(GPIO_BOARD_ID_1, "board-id-1"); + + gpio_direction_output(GPIO_OLED_DATA_SELECT, 0); + gpio_direction_output(GPIO_SR_CLK, 0); + gpio_direction_output(GPIO_SR_DIN, 0); + gpio_direction_input(GPIO_TEST_MODE); + gpio_direction_output(GPIO_SFP_TXDIS, 1); + gpio_direction_output(GPIO_SR_LOAD, 0); + gpio_direction_output(GPIO_SW_RESET, 1); + gpio_direction_input(GPIO_SW_INT); + gpio_direction_input(GPIO_SFP_PWRGOOD); + gpio_direction_input(GPIO_SFP_TXFAULT); + gpio_direction_output(GPIO_SPI_CS_BCM, 1); + gpio_direction_input(GPIO_SFP_PRESENCE); + gpio_direction_input(GPIO_SFP_RXLOSS); + gpio_direction_output(GPIO_EXP_RST, 0); + gpio_direction_input(GPIO_POS_SENSE); + gpio_direction_input(GPIO_EXP_PWRGOOD); + gpio_direction_input(GPIO_EXP_PRESENCE); + gpio_direction_input(GPIO_KP_INT); + gpio_direction_input(GPIO_BOARD_ID_0); + gpio_direction_input(GPIO_BOARD_ID_1); + + /* set shift register default value */ + sr_value = (0 << SROUT_PCIE_RST) | + (0 << SROUT_BCM_RST) | + (1 << SROUT_KEYPAD_OLED_RST) | + (0 << SROUT_SFP_PWREN) | + (1 << SROUT_USB_RST) | + (1 << SROUT_AUDIO_RST) | + (0 << SROUT_EXP_PWREN) | + (1 << SROUT_OLED_PWREN); + set_shift_register((u8)sr_value); + + fbxgw_common_pci_preinit(); + + kirkwood_init(); + +#ifdef CONFIG_MACH_FBXGW1R_EXPANSION_BOARD_SETUP + /* + * invoke expansion board setup early if needed, we want the + * PCI device on the expansion board to be there + */ + fbxgw1r_expansion_board_setup(); +#endif + + /* make a good pci reset */ + fbxgw1r_pcie_reset(0); + mdelay(100); + fbxgw1r_pcie_reset(1); + mdelay(100); + + fbxgw_common_pcie_retrain_link(); + +#ifdef CONFIG_FBXGW_COMMON_I2C_25K + n = 5; +#endif +#ifdef CONFIG_FBXGW_COMMON_I2C_50K + n = 4; +#endif +#ifdef CONFIG_FBXGW_COMMON_I2C_100K + n = 3; +#endif + kirkwood_i2c_init(12, n); + i2c_register_board_info(0, fbxgw1r_i2c_devs, + ARRAY_SIZE(fbxgw1r_i2c_devs)); + + /* tdm spi gpio, only for CS1 */ + tdm_cs_gpio[0] = -1; + tdm_cs_gpio[1] = GPIO_SPI_CS_BCM; + kirkwood_tdm_spi_init(tdm_cs_gpio); + spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); + + serial = arch_get_fbxserial(); + if (serial) { + /* + * use mac provided in serialinfo. + */ + memcpy(fbxgw1r_ge00_data.mac_addr, serial->mac_addr_base, + ETH_ALEN); + memcpy(fbxgw1r_ge01_data.mac_addr, serial->mac_addr_base, + ETH_ALEN); + } + + + kirkwood_ehci_init(); + kirkwood_ge00_init(&fbxgw1r_ge00_data); + kirkwood_ge01_init(&fbxgw1r_ge01_data); + fbxgw_sata_init(); + kirkwood_uart0_init(); + kirkwood_uart1_init(); + + fbxgw_common_nand_init(); + + platform_device_register(&fbxgw1r_gpio_device); + fbxgw_fbxatm_init(); + fbxgw_fbxwatchdog_init(); +} + +MACHINE_START(FBXGW1R, "Freebox Gateway version 1") + .atag_offset = 0x100, + .init_machine = fbxgw1r_init, +#ifdef CONFIG_PSTORE_RAM + .reserve = fbxgw_reserve_crash_zone, +#endif + .map_io = kirkwood_map_io, + .init_early = kirkwood_init_early, + .init_irq = kirkwood_init_irq, + .timer = &kirkwood_timer, + .restart = kirkwood_restart, +MACHINE_END --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/fbxgw2r-setup.c 2014-04-17 16:28:02.436886415 +0200 @@ -0,0 +1,617 @@ +/* + * fbxgw2r-setup.c for fbxgw2r + * Created by on Wed May 30 17:31:27 2012 + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include "mpp.h" +#include "common.h" +#include "fbxgw-common.h" +#include "fbxgw-switch.h" + +#define PFX "fbxgw2r: " + +/* + * reset whatever is behind the (inactive) mini-PCIe connector + */ +static void fbxgw2r_pcie_reset(int value) +{ + gpio_set_value(GPIO_PCIE_RST, value); +} + +/* + * reset onboard WLAN chip. + */ +static void fbxgw2r_wlan_rst(int value) +{ + gpio_set_value(GPIO_WLAN_RST, value); +} + +/* + * reset onboard audio codec + */ +static void fbxgw2r_audio_rst(int value) +{ + gpio_set_value(GPIO_AUDIO_RST, value); +} + +static void fbxgw2r_marvell_switch_reset(int value) +{ + gpio_set_value(GPIO_SW_RESET, value); +} + +static int fbxgw2r_do_vlan(void) +{ +#ifdef CONFIG_MACH_FBXGW2R_ETHSW_CONFIG_VLAN + return 1; +#else + return 0; +#endif +} + +#define NFS_VLAN_ID 41 + +static int marvell_6176_config(struct net_device *dev, int probe, + int (*mii_read)(struct net_device *dev, + int phy_id, int reg), + void (*mii_write)(struct net_device *dev, + int phy_id, int reg, int val)) +{ + u16 val; + struct mii_struct mii = { + .dev_id = 0, + .dev = dev, + .read = mii_read, + .write = mii_write, + }; + + if (!probe) + return 0; + + fbxgw2r_marvell_switch_reset(0); + msleep(1); + fbxgw2r_marvell_switch_reset(1); + msleep(2000); + + /* probe */ + val = mii_read(dev, SWPORT(0), PORTREG_SWITCH_IDENTIFIER); + if (PRODUCT_NUM(val) != 0x176) { + printk(KERN_ERR PFX "unknown switch id: 0x%08x\n", + PRODUCT_NUM(val)); + return 1; + } + mii.dev_id = PRODUCT_NUM(val); + mii.indirect_phy_access = true; + + fbxgw_sw_config_cpu_port(&mii, SWPORT(5)); + fbxgw_sw_config_phy_port(&mii, PHYPORT(0)); + + mii.write(dev, SWPORT(0), 0x16, 0x8011); + mii.write(dev, SWPORT(1), 0x16, 0x8011); + mii.write(dev, SWPORT(2), 0x16, 0x8011); + mii.write(dev, SWPORT(3), 0x16, 0x8011); + + if (fbxgw2r_do_vlan()) { + const u8 config[7] = { + PDATA_MEMBER_UNTAGGED, + PDATA_NOT_MEMBER, + PDATA_NOT_MEMBER, + PDATA_NOT_MEMBER, + PDATA_NOT_MEMBER, + PDATA_MEMBER_TAGGED, + PDATA_NOT_MEMBER, + }; + + fbxgw_sw_vtu_stu_init(&mii, PCR_PORTSTATE_FORWARDING, + sizeof (config)); + fbxgw_sw_vtu_load(&mii, NFS_VLAN_ID, config, sizeof (config)); + + fbxgw_sw_port_default_vid(&mii, SWPORT(0), NFS_VLAN_ID); + fbxgw_sw_port_dot1q_secure(&mii, SWPORT(0)); + fbxgw_sw_port_dot1q_secure(&mii, SWPORT(5)); + } + + fbxgw_sw_port_forward_enable(&mii, SWPORT(5)); + fbxgw_sw_port_forward_enable(&mii, SWPORT(0)); + + printk(KERN_INFO PFX "marvell 6176 initialized\n"); + + return 0; +} + +static struct mv643xx_eth_platform_data fbxgw2r_ge00_data = { + .phy_addr = MV643XX_ETH_PHY_NONE, + .speed = SPEED_1000, + .duplex = DUPLEX_FULL, +#ifdef CONFIG_MACH_FBXGW2R_ETHSW_CONFIG + .mii_config = marvell_6176_config, +#endif +}; + + + +static const struct flash_platform_data flash_info = { + .name = "bcmflash", +}; + +static const struct ssd1327_platform_data ssd1327_pd = { + .data_select_gpio = GPIO_OLED_DATA_SELECT, + .width = 128, + .height = 128, + .rotate = 270, + .watchdog = 300, +}; + +static struct spi_board_info spi_board_info[] __initdata = { + + { + .modalias = "ssd1327", + .platform_data = &ssd1327_pd, + .mode = SPI_MODE_0, + .max_speed_hz = 10 * 1000 * 1000, + .bus_num = 0, + .chip_select = 0, + }, + + { + .modalias = "m25p80", + .platform_data = &flash_info, + .mode = SPI_MODE_0, + .max_speed_hz = 4 * 1000 * 1000, + .bus_num = 0, + .chip_select = 1, + }, +}; + +/* + * fbxgpio + */ +static struct fbxgpio_operations fbxgw2r_gpio_ops = { + /* cast only for signed/unsigned */ + .get_datain = (int (*)(int))gpio_get_value, + .get_dataout = (int (*)(int))gpio_get_value, + .set_dataout = (void (*)(int, int))gpio_set_value, +}; + +static struct fbxgpio_pin fbxgw2r_gpio_pins[] = { + /* marvell gpios */ + { + .pin_name = "bcm-rst", + .direction = GPIO_DIR_OUT, + .pin_num = GPIO_BCM_RST, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "pcie-rst", + .direction = GPIO_DIR_OUT, + .pin_num = GPIO_PCIE_RST, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "sw-int", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_SW_INT, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "test-mode", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_TEST_MODE, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "sfp-pwren", + .direction = GPIO_DIR_OUT, + .pin_num = GPIO_SFP_PWREN, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "sfp-txdis", + .direction = GPIO_DIR_OUT, + .pin_num = GPIO_SFP_TXDIS, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "sfp-pwrgood", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_SFP_PWRGOOD, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "sfp-presence", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_SFP_PRESENCE, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "sfp-rxloss", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_SFP_RXLOSS, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "sfp-txfault", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_SFP_TXFAULT, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "audio-rst", + .direction = GPIO_DIR_OUT, + .pin_num = GPIO_AUDIO_RST, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "pos-sense", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_POS_SENSE, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "exp-presence", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_EXP_PRESENCE, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "exp-pwrgood", + .direction = GPIO_DIR_IN, + .pin_num = GPIO_EXP_PWRGOOD, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "exp-pwren", + .direction = GPIO_DIR_OUT, + .pin_num = GPIO_EXP_PWREN, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "exp-rst", + .direction = GPIO_DIR_OUT, + .pin_num = GPIO_EXP_RST, + .ops = &fbxgw2r_gpio_ops, + }, + { + .pin_name = "sw-reset", + .direction = GPIO_DIR_OUT, + .pin_num = GPIO_SW_RESET, + .ops = &fbxgw2r_gpio_ops, + }, + + { }, +}; + +static struct platform_device fbxgw2r_gpio_device = { + .name = "fbxgpio", + .id = -1, + .dev = { + .platform_data = &fbxgw2r_gpio_pins, + }, +}; + + +/* + * MPP pin muxing. + */ +static u32 fbxgw2r_mpp_config[] = { + MPP0_NF_IO2, + MPP1_NF_IO3, + MPP2_NF_IO4, + MPP3_NF_IO5, + MPP4_NF_IO6, + MPP5_NF_IO7, + + MPP6_SYSRST_OUTn, + MPP7_GPO, /* GPIO_OLED_DATA_SELECT */ + + MPP8_TW0_SDA, + MPP9_TW0_SCK, + + MPP10_GPO, /* USB_PWREN */ + + MPP11_UART0_RXD, /* From Broadcom Uart */ + + MPP12_GPO, /* SFP TX disable */ + MPP13_GPIO, /* BOOT_ETH */ + MPP14_GPIO, /* WLAN RST */ + + MPP15_UART1_TXD, /* main uart tx */ + MPP16_UART1_RXD, /* main uart rx */ + + MPP17_GPIO, /* GPIO_PCIE_RST */ + + MPP18_NF_IO0, + MPP19_NF_IO1, + + MPP20_GPIO, /* DISPLAY_PWREN */ + MPP21_GPIO, /* IHM_RST */ + MPP22_GPIO, /* EXP_PWREN*/ + MPP23_GPIO, /* USB_RSTn */ + + MPP24_TDM_SPI_CS0, + MPP25_TDM_SPI_SCK, + MPP26_TDM_SPI_MISO, + MPP27_TDM_SPI_MOSI, + + MPP28_GPIO, /* GPIO_SW_RESET */ + MPP29_GPIO, /* SW_INT */ + MPP30_GPIO, /* GPIO_BCM_RST */ + MPP31_GPIO, /* SFP_PRESn */ + MPP32_GPIO, /* SFP_PWRGOOD */ + MPP33_GPO, /* AUDIO_RSTn */ + + MPP34_GPIO, /* GPIO_SPI_CS_BCM */ + + MPP35_GPIO, /* SFP_TXFAULT */ + + MPP36_TW1_SDA, + MPP37_TW1_SCK, + + MPP38_GPIO, /* SFP_RXLOSS */ + + MPP39_AU_I2SBCLK, + MPP40_AU_I2SDO, + MPP41_AU_I2SLRCLK, + MPP42_AU_I2SMCLK, + MPP43_AU_I2SDI, + + MPP44_GPIO, /* EXP_RSTn */ + MPP45_GPIO, /* POS_SENSE */ + MPP46_GPIO, /* EXP_PWRGOOD */ + MPP47_GPIO, /* EXP_PRESn */ + MPP48_GPIO, /* KEYPAD_IRQn */ + MPP49_GPO, /* SFP_PWREN */ + + 0 +}; + + +/* + * i2c midplane eeprom. + */ +static struct at24_platform_data midplane_eeprom_data = { + .byte_len = 4096, + .page_size = 8, + .flags = AT24_FLAG_ADDR16, +}; + +/* + * expansion board eeprom. + */ +static struct at24_platform_data expansion_eeprom_data = { + .byte_len = 32768, + .page_size = 64, + .flags = AT24_FLAG_ADDR16, +}; + +/* + * i2c smsc + */ +static struct smsc_cap1066_pdata cap1066_pdata = { + .key_map = { + KEY_DOWN, + KEY_LEFT, + KEY_UP, + 0, + KEY_ENTER, + KEY_RIGHT, + }, + + .has_irq_gpio = true, + .irq_gpio = GPIO_KP_INT, +}; + +static struct i2c_board_info fbxgw2r_i2c0_devs[] = { + { + .type = "cap1066", + .addr = 0x28, + .platform_data = &cap1066_pdata, + }, + { + .type = "24c32", + .addr = 0x57, + .platform_data = &midplane_eeprom_data, + }, + { + .type = "24c256", + .addr = 0x53, + .platform_data = &expansion_eeprom_data, + }, +}; + +static struct i2c_board_info fbxgw2r_i2c1_devs[] = { + { + I2C_BOARD_INFO("cs42l52", 0x4a), + }, +}; + +#ifdef CONFIG_MACH_FBXGW2R_EXPANSION_BOARD_SETUP +static int fbxgw2r_expansion_board_setup(void) +{ + int plugged; + + plugged = !gpio_get_value(GPIO_EXP_PRESENCE); + if (!plugged) { + printk(KERN_INFO PFX "No expansion board plugged.\n"); + return 0; + } + + printk(KERN_INFO PFX "Expansion board plugged, powering up.\n"); + gpio_set_value(GPIO_EXP_PWREN, 1); + gpio_set_value(GPIO_EXP_RST, 1); + mdelay(1000); + + printk(KERN_INFO PFX "Expansion powered up safely"); + return 0; +} +#endif + +struct platform_device fbxgw2r_audio = { + .name = "fbxgw2r-audio", + .id = -1, +}; + +void __init fbxgw2r_init(void) +{ + const struct fbx_serial *serial; + extern int panic_timeout; + int tdm_cs_gpio[2]; + unsigned int n; + + panic_timeout = 10; + panic_on_oops = 1; + + kirkwood_mpp_conf(fbxgw2r_mpp_config); + + gpio_request(GPIO_OLED_DATA_SELECT, "oled-data-select"); + gpio_request(GPIO_WLAN_RST, "wlan-rst"); + gpio_request(GPIO_PCIE_RST, "pcie-rst"); + gpio_request(GPIO_SW_RESET, "sw-reset"); + gpio_request(GPIO_SW_INT, "sw-int"); + gpio_request(GPIO_TEST_MODE, "test-mode"); + gpio_request(GPIO_SPI_CS_BCM, "spi-cs-bcm"); + gpio_request(GPIO_BCM_RST, "bcm-rst"); + gpio_request(GPIO_SFP_TXDIS, "sfp-txdis"); + gpio_request(GPIO_SFP_PRESENCE, "sfp-presence"); + gpio_request(GPIO_SFP_PWRGOOD, "sfp-pwrgood"); + gpio_request(GPIO_SFP_TXFAULT, "sfp-txfault"); + gpio_request(GPIO_SFP_RXLOSS, "sfp-rxloss"); + gpio_request(GPIO_KP_INT, "kp-int"); + gpio_request(GPIO_SFP_PWREN, "sfp-pwren"); + gpio_request(GPIO_POS_SENSE, "pos-sense"); + gpio_request(GPIO_AUDIO_RST, "audio-rst"); + + gpio_request(GPIO_EXP_PWREN, "exp-pwren"); + gpio_request(GPIO_EXP_PWRGOOD, "exp-pwrgood"); + gpio_request(GPIO_EXP_PRESENCE, "exp-presence"); + gpio_request(GPIO_EXP_RST, "exp-rst"); + + gpio_direction_output(GPIO_OLED_DATA_SELECT, 0); + gpio_direction_output(GPIO_WLAN_RST, 0); + gpio_direction_input(GPIO_TEST_MODE); + gpio_direction_output(GPIO_PCIE_RST, 0); + gpio_direction_output(GPIO_SW_RESET, 0); + gpio_direction_input(GPIO_SW_INT); + gpio_direction_output(GPIO_SPI_CS_BCM, 1); + gpio_direction_output(GPIO_BCM_RST, 0); + gpio_direction_output(GPIO_AUDIO_RST, 0); + gpio_direction_input(GPIO_POS_SENSE); + + gpio_direction_output(GPIO_SFP_PWREN, 0); + gpio_direction_output(GPIO_SFP_TXDIS, 1); + gpio_direction_input(GPIO_SFP_PRESENCE); + gpio_direction_input(GPIO_SFP_PWRGOOD); + gpio_direction_input(GPIO_SFP_TXFAULT); + gpio_direction_input(GPIO_SFP_RXLOSS); + + gpio_direction_output(GPIO_EXP_PWREN, 0); + gpio_direction_output(GPIO_EXP_RST, 0); + gpio_direction_input(GPIO_EXP_PRESENCE); + gpio_direction_input(GPIO_EXP_PWRGOOD); + + kirkwood_init(); + +#ifdef CONFIG_MACH_FBXGW2R_EXPANSION_BOARD_SETUP + /* + * invoke expansion board setup early if needed, we want the + * PCI device on the expansion board to be there + */ + fbxgw2r_expansion_board_setup(); +#endif + + fbxgw_common_pci_preinit(); + + /* make a good pci reset */ + fbxgw2r_pcie_reset(0); + fbxgw2r_wlan_rst(0); + mdelay(100); + fbxgw2r_pcie_reset(1); + fbxgw2r_wlan_rst(1); + mdelay(100); + fbxgw_common_pcie_retrain_link(); + + /* reset audio codec */ + fbxgw2r_audio_rst(0); + mdelay(100); + fbxgw2r_audio_rst(1); + + /* 25khz I2C */ +#ifdef CONFIG_FBXGW_COMMON_I2C_25K + n = 5; +#endif +#ifdef CONFIG_FBXGW_COMMON_I2C_50K + n = 4; +#endif +#ifdef CONFIG_FBXGW_COMMON_I2C_100K + n = 3; +#endif + kirkwood_i2c_init(12, n); + kirkwood_i2c1_init(12, n); + i2c_register_board_info(0, fbxgw2r_i2c0_devs, + ARRAY_SIZE(fbxgw2r_i2c0_devs)); + i2c_register_board_info(1, fbxgw2r_i2c1_devs, + ARRAY_SIZE(fbxgw2r_i2c1_devs)); + + kirkwood_uart0_init(); + kirkwood_uart1_init(); + + serial = arch_get_fbxserial(); + if (serial) { + memcpy(fbxgw2r_ge00_data.mac_addr, serial->mac_addr_base, + ETH_ALEN); + } else { + memcpy(fbxgw2r_ge00_data.mac_addr, + "\x00\x07\xcb\0x00\x00\xfd", ETH_ALEN); + } + + kirkwood_ge00_init(&fbxgw2r_ge00_data); + kirkwood_ehci_init(); + + fbxgw_common_nand_init(); + + /* tdm spi gpio, only for CS1 */ + tdm_cs_gpio[0] = -1; + tdm_cs_gpio[1] = GPIO_SPI_CS_BCM; + kirkwood_tdm_spi_init(tdm_cs_gpio); + spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info)); + + platform_device_register(&fbxgw2r_gpio_device); + fbxgw_fbxatm_init(); + fbxgw_sata_init(); + fbxgw_fbxwatchdog_init(); + kirkwood_audio_init(); + platform_device_register(&fbxgw2r_audio); +} + +MACHINE_START(FBXGW2R, "Freebox Gateway version 2") + .atag_offset = 0x100, + .init_machine = fbxgw2r_init, +#ifdef CONFIG_PSTORE_RAM + .reserve = fbxgw_reserve_crash_zone, +#endif + .map_io = kirkwood_map_io, + .init_early = kirkwood_init_early, + .init_irq = kirkwood_init_irq, + .timer = &kirkwood_timer, + .restart = kirkwood_restart, +MACHINE_END --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/fbxgw-common.c 2014-04-17 16:28:02.432886337 +0200 @@ -0,0 +1,505 @@ +/* + * fbxgw-common.c for fbxgw-common + * Created by on Wed May 30 17:53:10 2012 + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "common.h" + +struct fbx_serial serial; + +#define PFX "fbxgw-common: " + +/* + * code that can be shared between fbxgw1r & fbxgw2r: + * - crash zone init + * - fbxserial stuff. + * - nand timings & nand partitions + * - ATAG_LOADER_VERSION and ATAG_BOOT_INFO entries in + * tagged list. + */ + +/* + * top of RAM - 32k, just below bootloader page table + */ +#define CRASH_ZONE_ADDR_FBXGW1R 0x1fff8000 +#define CRASH_ZONE_ADDR_FBXGW2R 0x3fff8000 + +static phys_addr_t __init crash_zone_addr(void) +{ + if (machine_is_fbxgw1r()) + return CRASH_ZONE_ADDR_FBXGW1R; + if (machine_is_fbxgw2r()) + return CRASH_ZONE_ADDR_FBXGW2R; + + return 0; +} + +void __init fbxgw_reserve_crash_zone(void) +{ + phys_addr_t addr = crash_zone_addr(); + + if (!addr) { + pr_warn(PFX "invalid crash_zone_addr.\n"); + return ; + } + + memblock_reserve(addr, SZ_16K); +} + +static struct ramoops_platform_data ramoops_data = { + .mem_size = SZ_16K, + .mem_address = ~0 /* changed at runtime */, + .record_size = SZ_16K, + .dump_oops = 1, + .ecc_size = 1, +}; + +static struct platform_device ramoops_dev = { + .name = "ramoops", + .dev = { + .platform_data = &ramoops_data, + }, +}; + +/* + * cannot setup crash_zone earlier than an init call since we need a + * working ioremap, not provided earlier. + */ +static int __init fbxgw_setup_crash_zone(void) +{ + phys_addr_t addr = crash_zone_addr(); + + if (!addr) { + pr_warn(PFX "invalid crash_zone_addr.\n"); + return -EINVAL; + } + + ramoops_data.mem_address = addr; + return platform_device_register(&ramoops_dev); +} + +arch_initcall(fbxgw_setup_crash_zone); + + +/* + * fbxserialinfo stuff. + */ +static int got_serial; +const struct fbx_serial *arch_get_fbxserial(void) +{ + if (got_serial) + return &serial; + return NULL; +} +EXPORT_SYMBOL(arch_get_fbxserial); + +static int __init fbxgw2r_parse_fbxserial_tag(const struct tag *tag) +{ + memcpy(&serial, &tag->u.fbxserial, sizeof (serial)); + add_device_randomness(&serial, sizeof (serial)); + got_serial = 1; + return 0; +} +__tagtable(ATAG_FBXSERIAL, fbxgw2r_parse_fbxserial_tag); + + +/* + * NAND flash + */ +static struct mtd_partition fbxgw1r_nand_parts[] = { + { + .name = "all", + .offset = 0, + .size = MTDPART_SIZ_FULL, + .mask_flags = MTD_WRITEABLE, + }, { + .name = "u-boot", + .offset = 0, + .size = SZ_1M, + .mask_flags = MTD_WRITEABLE, + }, { + .name = "serial", + .offset = SZ_1M, + .size = SZ_1M, + .mask_flags = MTD_WRITEABLE, + }, { + .name = "calibration", + .offset = SZ_1M * 2, + .size = SZ_1M, + .mask_flags = MTD_WRITEABLE, + }, { + .name = "bank0", + .offset = SZ_1M * 3, + .size = SZ_1M * 18, + .mask_flags = MTD_WRITEABLE, + }, { + .name = "nvram", + .offset = SZ_1M * 21, + .size = SZ_1M * 3, + }, { + .name = "bank1", + .offset = SZ_1M * 24, + .size = SZ_1M * 62, + }, { + .name = "femto", + .offset = SZ_1M * 86, + .size = SZ_1M * 16, + }, { + .name = "config", + .offset = SZ_1M * 120, + .size = SZ_1M * 8, + }, { + .name = "new_bank0", + .offset = SZ_1M * 102, + .size = SZ_1M * 18, + }, +}; + + +/* + * Hardcoded timings for two known NAND parts: + * - NUMONYX NAND01GW3B2CZA6F + * - TOSHIBA TC58NVG0S3EBAI4 + * + * Kirkwood to ONFI mapping (from Marvell) + * ======================================= + * TurnOff => tRHW + * Acc2First => tCEA + * Acc2Next => tRC + * NFOEnW => tREH + * CEn2WEn => tCS – tWP + * WrLow => tWP + * WrHigh => tWH + * + * = Numonyx + * tRHW = 100ns | 20 Turnoff cycles (regvalue = 16) + * tCEA = 25ns | 5 Acc2first cycles (regvalue = 9) + * tRC = 25ns | 5 Acc2next cycles (regvalue = 5) + * tREH = 10ns | 2 NOFEnW cycles (regvalue = 1) + * tCS - tWP = 20ns - 12ns = 8ns | 2 CEn2WEn cycles (regvalue = 6) + * tWp = 12ns | 3 WrLow cycles (regvalue = 3) + * tWh = 10ns | 2 WrHigh cycles (regvalue = 2) + * command delay: 25ns + * + * = Toshiba + * tRHW = 30ns | 6 Turnoff cycles (regvalue 2) + * tCEA = 25ns | 5 Acc2first cycles (regvalue 9) + * tRC = 25ns | 5 Acc2next cycles (regvalue 5) + * tREH = 10ns | 5 NOFEnW cycles (regvalue 2) + * tCS - tWP = 20ns - 12ns = 8ns | 2 CEn2WEn cycles (regvalue = 6) + * tWp = 12ns | 3 WrLow cycles (regvalue = 3) + * tWh = 10ns | 2 WrHigh cycles (regvalue = 2) + * command delay: 30ns + * + * all values are the same besides Turnoff + * add one cycle for all values + * + * BEWARE: Acc2next & NFOEnW ARE LINKED ! Any additional cycles given + * to NOFEnW must be accounted for in Acc2next + */ +#define NAND_COMMAND_DELAY 35 + +static void __init set_nand_timings(void) +{ + u32 val; + u32 turnoff, acc2first, acc2next, nofenw, cen2wen, wrlow, wrhigh; + +#ifdef CONFIG_FBXGW_COMMON_NAND_SAFE_READ_TIMINGS + turnoff = 0x1f; + acc2first = 0x1f; + acc2next = 0x1f; + nofenw = 0xc; +#else + turnoff = 0x11; + acc2first = 0xa; + acc2next = 0x7; + nofenw = 0x2; +#endif + +#ifdef CONFIG_FBXGW_COMMON_NAND_SAFE_WRITE_TIMINGS + cen2wen = 0xf; + wrlow = 0xf; + wrhigh = 0xf; +#else + cen2wen = 0x7; + wrlow = 0x4; + wrhigh = 0x3; +#endif + + + val = readl(NAND_VIRT_BASE + NAND_RD_PARAM_OFF); + /* turnoff */ + val &= ~(0x1f << 0); + val |= (turnoff << 0); + /* acc2first */ + val &= ~(0x1f << 6); + val |= (acc2first << 6); + /* acc2next */ + val &= ~(0x1f << 17); + val |= (acc2next << 17); + writel(val, NAND_VIRT_BASE + NAND_RD_PARAM_OFF); + + val = readl(NAND_VIRT_BASE + NAND_FLASH_CTL_OFF); + /* nfoenw */ + val &= ~(0x1f << 9); + val |= (nofenw << 9); + writel(val, NAND_VIRT_BASE + NAND_FLASH_CTL_OFF); + + val = readl(NAND_VIRT_BASE + NAND_WR_PARAM_OFF); + /* CEn2WEn */ + val &= ~(0xf << 0); + val |= (cen2wen << 0); + /* WrLow */ + val &= ~(0xf << 8); + val |= (wrlow << 8); + /* WrHigh */ + val &= ~(0xf << 16); + val |= (wrhigh << 16); + writel(val, NAND_VIRT_BASE + NAND_WR_PARAM_OFF); +} + +#ifdef CONFIG_FBXGW_COMMON_PARTS_WRITE_ALL +static void __init set_parts_writeable(struct mtd_partition *parts, int count) +{ + int i; + + for (i = 0; i < count; ++i) { + parts[i].mask_flags &= ~MTD_WRITEABLE; + } +} +#endif + + +void __init fbxgw_common_nand_init(void) +{ + struct kirkwood_nand_ecc ecc; + + set_nand_timings(); +#ifdef CONFIG_FBXGW_COMMON_PARTS_WRITE_ALL + set_parts_writeable(fbxgw1r_nand_parts, ARRAY_SIZE(fbxgw1r_nand_parts)); +#endif + + if (machine_is_fbxgw1r()) + ecc.ecc = NAND_ECC_SOFT; + + if (machine_is_fbxgw2r()) { + ecc.ecc = NAND_ECC_SOFT_BCH; + /* default to 4 bits error correction per 512 bytes for now */ + ecc.bch_ecc_size = 512; + ecc.bch_ecc_bytes = 7; + } + + kirkwood_nand_init_ecc(ARRAY_AND_SIZE(fbxgw1r_nand_parts), + NAND_COMMAND_DELAY, &ecc); +} + +/* + * fbxhwinfo fields, retrieved from ATAG list. + */ +char loader_version_str[128]; +int loader_erase_nvram = 0; +int loader_bank0_forced = 0; +EXPORT_SYMBOL(loader_version_str); +EXPORT_SYMBOL(loader_erase_nvram); +EXPORT_SYMBOL(loader_bank0_forced); + +static int __init fbxgw_parse_loader_version(const struct tag *tag) +{ + const char *version; + + version = tag->u.loader_version.version; + + if (strncmp(version, "u-boot-", 7) || + strlen(version) > sizeof (loader_version_str) - 1) { + printk(KERN_ERR PFX "invalid loader version.\n"); + return 0; + } + + strcpy(loader_version_str, version); + printk(KERN_INFO PFX "loader version is '%s'\n", loader_version_str); + return 0; +} +__tagtable(ATAG_LOADER_VERSION, fbxgw_parse_loader_version); + +static int __init fbxgw_parse_boot_info(const struct tag *tag) +{ + if (tag->u.boot_info.erase_nvram) { + printk(KERN_INFO PFX "loader asked for nvram erase.\n"); + loader_erase_nvram = 1; + } + if (tag->u.boot_info.bank0_forced) { + printk(KERN_INFO PFX "loader user forced a bank0 boot.\n"); + loader_bank0_forced = 1; + } + return 0; +} +__tagtable(ATAG_BOOT_INFO, fbxgw_parse_boot_info); + +/* + * PCIe + */ +#define PCIE_BASE ((void __iomem *)PCIE_VIRT_BASE) +#define PCIE1_BASE ((void __iomem *)PCIE1_VIRT_BASE) + +static void __init __fbxgw_pcie_preinit(int index, void __iomem *base) +{ + u32 val; + u32 pcie_enable_mask = index == 0 ? PCIE0_ENABLE : PCIE1_ENABLE; + + /* we will reset PCIe bus, make sure it's correctly disabled + * first */ + val = readl(CPU_CONTROL); + if (!(val & pcie_enable_mask)) { + val |= pcie_enable_mask; + writel(val, CPU_CONTROL); + return; + } + + if (!orion_pcie_link_up(base)) + return; + + orion_pcie_set_link_disable(base, 1); + mdelay(100); + orion_pcie_set_link_disable(base, 0); +} + +void __init fbxgw_common_pci_preinit(void) +{ + __fbxgw_pcie_preinit(0, PCIE_BASE); + if (machine_is_fbxgw2r()) + __fbxgw_pcie_preinit(1, PCIE1_BASE); +} + +static void __init __fbxgw_pcie_retrain_link(int index, void __iomem *base) +{ + u32 cgc; + + /* + * be sure to enable corresponding PCIe clock. CGC_PEX0 might + * already be set due to previous call to kirkwood_pcie_id() + * though. + */ + cgc = readl(CLOCK_GATING_CTRL); + switch (index) { + case 0: + cgc |= CGC_PEX0; + break; + case 1: + cgc |= CGC_PEX1; + break; + } + writel(cgc, CLOCK_GATING_CTRL); + + mdelay(100); + orion_pcie_set_retrain_link(base, 1); + mdelay(1); + /* check link, should be up */ + if (!orion_pcie_link_up(base)) + printk(KERN_ERR PFX "PCIe%d link is down\n", index); + +} + +void __init fbxgw_common_pcie_retrain_link(void) +{ + __fbxgw_pcie_retrain_link(0, PCIE_BASE); + if (machine_is_fbxgw2r()) + __fbxgw_pcie_retrain_link(1, PCIE1_BASE); +} + +/* + * be sure to add allow any new board here ... + */ +static int __init fbxgw_pci_init(void) +{ + unsigned int mask; + if (!machine_is_fbxgw1r() && !machine_is_fbxgw2r()) + return -ENODEV; + + mask = KW_PCIE0; + if (machine_is_fbxgw2r()) + mask |= KW_PCIE1; + kirkwood_pcie_init(mask); + return 0; +} +subsys_initcall(fbxgw_pci_init); + +/* + * board name for fbxhwinfo + */ +char fbxhwinfo_model[32]; +EXPORT_SYMBOL(fbxhwinfo_model); +static int __init fbxgw_setup_model(void) +{ + if (machine_is_fbxgw1r()) + sprintf(fbxhwinfo_model, "fbxgw1r"); + if (machine_is_fbxgw2r()) + sprintf(fbxhwinfo_model, "fbxgw2r"); + return 0; +} +arch_initcall(fbxgw_setup_model); + +/* + * broadcom 6358 remote atm device + */ +static struct fbxatm_remote_pdata bcm6358_remote_pdata = { + .remote_mac = "\x00\x07\xcb\x00\x00\xfe", + .netdev_name = "eth0.43", + .remote_name = "bcm63xx_fbxxtm0", +}; + +static struct platform_device fbxatm_remote_device = { + .name = "fbxatm_remote", + .id = -1, + .dev = { + .platform_data = &bcm6358_remote_pdata, + }, +}; + +void __init fbxgw_fbxatm_init(void) +{ + platform_device_register(&fbxatm_remote_device); +} + +/* + * internal & external SATA ports + */ +static struct mv_sata_platform_data fbxgw_sata_data = { + .n_ports = 2, +}; + +void __init fbxgw_sata_init(void) +{ + kirkwood_sata_init(&fbxgw_sata_data); +} + +/* + * fbxwatchdog + */ +static struct platform_device orion_fbxwdt_device = { + .name = "orion_fbxwdt", + .id = -1, + .num_resources = 0, +}; + +void __init fbxgw_fbxwatchdog_init(void) +{ + platform_device_register(&orion_fbxwdt_device); +} --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/fbxgw-common.h 2014-04-17 16:28:02.432886337 +0200 @@ -0,0 +1,17 @@ +/* + * fbxgw-common.h for fbxgw-common + * Created by on Wed May 30 17:56:16 2012 + */ + +#ifndef __FBXGW_COMMON_H +# define __FBXGW_COMMON_H + +void fbxgw_reserve_crash_zone(void); +void fbxgw_common_nand_init(void); +void fbxgw_common_pci_preinit(void); +void fbxgw_common_pcie_retrain_link(void); +void fbxgw_fbxatm_init(void); +void fbxgw_sata_init(void); +void fbxgw_fbxwatchdog_init(void); + +#endif /* !__FBXGW_COMMON_H */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/fbxgw-switch.c 2014-04-17 16:28:02.432886337 +0200 @@ -0,0 +1,309 @@ +/* + * fbxgw-switch.c for fbxgw-switch + * Created by on Tue Jun 5 20:46:17 2012 + */ + +#include +#include +#include +#include + +#include "fbxgw-switch.h" + +#define PFX "fbxgw-switch: " + + +#define MARVELL_PHYPORT0 0x00 + +#define MARVELL_SWPORT0 0x10 +#define MARVELL_SWPORT4 0x14 +#define MARVELL_SWPORT5 0x15 + +#define PORTREG_PCS 0x1 + +#define PCS_RGMII_RX_DELAY (1 << 15) +#define PCS_RGMII_TX_DELAY (1 << 14) +#define PCS_FORCELINK_UP (1 << 5) +#define PCS_FORCELINK (1 << 4) +#define PCS_FORCEDUPLEX_FULL (1 << 3) +#define PCS_FORCEDUPLEX (1 << 2) +#define PCS_FORCESPEED_10 0x0 +#define PCS_FORCESPEED_100 0x1 +#define PCS_FORCESPEED_1000 0x2 +#define PCS_FORCESPEED_AUTO 0x3 + +#define PORTREG_PCR 0x4 +#define PCR_PORTSTATE_DISABLED 0x0 +/* #define PCR_PORTSTATE_FORWARDING 0x3 */ + +#define PORTREG_VLANID 0x7 + +#define PORTREG_PCR2 0x8 +#define PCR2_MODE_SHIFT 10 +#define PCR2_MODE_SECURE 3 + +#define MARVELL_GLOBAL1 0x1b +#define MARVELL_GLOBAL2 0x1c + +#define GLOBREG_VTUFID 0x2 +#define GLOBREG_VTUSID 0x3 + +#define GLOBREG_GCR 0x4 +#define GCR_PPUEN (1 << 14) + +#define GLOBREG_VTUOP 0x5 +#define VTUOP_BUSY (1 << 15) +#define VTUOP_OP_LOAD (0x3 << 12) +#define VTUOP_OP_STU_LOAD (0x5 << 12) +#define VTUOP_OP_GETNEXT (0x4 << 12) + +#define GLOBREG_VTUVID 0x6 +#define VTUVID_VALID (1 << 12) + +#define GLOBREG_VTU_P03_DATA 0x7 +#define GLOBREG_VTU_P46_DATA 0x8 + +#define GLOBREG_VTU_DATA 0x9 + +#define GLOBREG_SMI_CMD 0x18 +# define SMI_CMD_BUSY (1 << 15) +# define SMI_CLAUSE_22 (1 << 12) +# define SMI_CMD_READ (2 << 10) +# define SMI_CMD_WRITE (1 << 10) +# define SMI_DEVADDR(DevAddr) (DevAddr << 5) +# define SMI_REGADDR(RegAddr) (RegAddr) +#define GLOBREG_SMI_DATA 0x19 + +#define GLOBREG_GSR 0x0 +# define GSR_PPU_POLLING (1 << 15) + + +/* + * voodo register content. P4_RGMII_FORCE is effective on revision A2 + * of mv6161 chip. see revision A2 release notes for details. + */ +#define P4_RGMII_DELAY 0x03 +#define P5_RGMII_DELAY 0x18 + + + +static int __mii_indirect_wait(struct mii_struct *mii, int tries) +{ + while (tries) { + u16 val = mii->read(mii->dev, MARVELL_GLOBAL2, GLOBREG_SMI_CMD); + if ((val & SMI_CMD_BUSY) == 0) + return 0; + udelay(1000); + --tries; + } + return -ETIMEDOUT; +} + +static int __mii_indirect_read(struct mii_struct *mii, int phy_id, int reg) +{ + u16 smi_cmd = SMI_CMD_BUSY | SMI_CLAUSE_22 | SMI_CMD_READ | + SMI_DEVADDR(phy_id) | SMI_REGADDR(reg); + + mii->write(mii->dev, MARVELL_GLOBAL2, GLOBREG_SMI_CMD, smi_cmd); + if (__mii_indirect_wait(mii, 1000) < 0) { + printk(KERN_WARNING PFX "indirect phy read did not " + "complete.\n"); + return 0xffff; + } + return mii->read(mii->dev, MARVELL_GLOBAL2, GLOBREG_SMI_DATA); +} + +static int mii_phy_read(struct mii_struct *mii, int phy_id, int reg) +{ + if (mii->indirect_phy_access == false) + return mii->read(mii->dev, phy_id, reg); + else + return __mii_indirect_read(mii, phy_id, reg); +} + +static void __mii_indirect_write(struct mii_struct *mii, int phy_id, int reg, + int val) +{ + u16 smi_cmd = SMI_CMD_BUSY | SMI_CLAUSE_22 | SMI_CMD_WRITE | + SMI_DEVADDR(phy_id) | SMI_REGADDR(reg); + + mii->write(mii->dev, MARVELL_GLOBAL2, GLOBREG_SMI_DATA, val); + mii->write(mii->dev, MARVELL_GLOBAL2, GLOBREG_SMI_CMD, smi_cmd); + if (__mii_indirect_wait(mii, 1000) < 0) { + printk(KERN_WARNING PFX "indirect phy write did not " + "complete.\n"); + } +} + +static void mii_phy_write(struct mii_struct *mii, int phy_id, int reg, int val) +{ + + if (mii->indirect_phy_access == false) + return mii->write(mii->dev, phy_id, reg, val); + else + return __mii_indirect_write(mii, phy_id, reg, val); +} + +static void __vtu_wait(struct mii_struct *mii) +{ + for (;;) { + u16 val = mii->read(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTUOP); + if ((val & (1 << 15)) == 0) + break; + msleep(10); + } +} + +void fbxgw_sw_vtu_stu_init(struct mii_struct *mii, int port_state, + size_t nr_ports) +{ + u16 vtu_op = VTUOP_OP_STU_LOAD; + u16 regs[2] = { 0 , 0 }; + int i; + + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTUOP, vtu_op); + + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTUSID, 0); + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTUVID, VTUVID_VALID); + + + for (i = 0; i < nr_ports; ++i) { + int off; + int shift; + + off = i / 4; + shift = (i % 4) + 2; + + regs[off] |= port_state << shift; + } + + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTU_P03_DATA, regs[0]); + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTU_P46_DATA, regs[1]); + + vtu_op |= VTUOP_BUSY; + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTUOP, vtu_op); + __vtu_wait(mii); +} + +void fbxgw_sw_vtu_load(struct mii_struct *mii, u16 vid, const u8 *ports, + size_t nr_ports) +{ + u16 vtu_op; + u16 regs[2] = { 0, 0 }; + int i; + + vtu_op = VTUOP_OP_LOAD; + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTUOP, vtu_op); + + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTUFID, 1); + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTUSID, 0); + + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTUVID, + vid | VTUVID_VALID); + + for (i = 0; i < nr_ports; ++i) { + int off; + int shift; + + off = (i / 4); + shift = (i % 4) * 4; + + regs[off] |= ports[i] << shift; + } + + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTU_P03_DATA, regs[0]); + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTU_P46_DATA, regs[1]); + + vtu_op |= VTUOP_BUSY; + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_VTUOP, vtu_op); + + __vtu_wait(mii); +} + +void fbxgw_sw_config_cpu_port(struct mii_struct *mii, int swport) +{ + u16 pcs = PCS_FORCEDUPLEX_FULL | PCS_FORCEDUPLEX | + PCS_FORCESPEED_1000 | + PCS_FORCELINK | PCS_FORCELINK_UP; + + if (mii->dev_id == 0x176) + pcs |= PCS_RGMII_TX_DELAY | PCS_RGMII_RX_DELAY; + else { + static u16 delay; + /* + * set rgmii delay for cpu port (5) and ftth port (4), also + * force ftth port in RGMII mode + */ + if (swport == 5) + delay = P5_RGMII_DELAY; + else + delay = P4_RGMII_DELAY; + mii->write(mii->dev, MARVELL_SWPORT4, 0x1a, 0x81e7); + (void)mii->read(mii->dev, MARVELL_SWPORT5, 0x1a); + mii->write(mii->dev, MARVELL_SWPORT5, 0x1a, P5_RGMII_DELAY); + mii->write(mii->dev, MARVELL_SWPORT4, 0x1a, 0xc1e7); + } + + mii->write(mii->dev, swport, PORTREG_PCS, pcs); +} + +void fbxgw_sw_config_phy_port(struct mii_struct *mii, int phy_port) +{ + u16 val; + + if (mii->indirect_phy_access == false) { + val = mii->read(mii->dev, MARVELL_GLOBAL1, GLOBREG_GCR); + val &= ~GCR_PPUEN; + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_GCR, val); + } + + + /* power up phy for eth port 0 */ + val = mii_phy_read(mii, phy_port, 0x00); + val &= ~0x0800; + mii_phy_write(mii, phy_port, 0x00, val); + + + /* restart autoneg */ + val = mii_phy_read(mii, phy_port, 0x00); + val |= 0x0200; + mii_phy_write(mii, phy_port, 0x00, val); + + mii_phy_write(mii, phy_port, 20, 0); + + if (mii->indirect_phy_access == false) { + val = mii->read(mii->dev, MARVELL_GLOBAL1, GLOBREG_GCR); + val |= GCR_PPUEN; + mii->write(mii->dev, MARVELL_GLOBAL1, GLOBREG_GCR, val); + } +} + +void fbxgw_sw_port_default_vid(struct mii_struct *mii, int swport, u16 vid) +{ + u16 val; + + val = mii->read(mii->dev, swport, PORTREG_VLANID); + val &= ~0xfff; + val |= vid; + mii->write(mii->dev, swport, PORTREG_VLANID, val); +} + +void fbxgw_sw_port_dot1q_secure(struct mii_struct *mii, int swport) +{ + u16 val; + + val = mii->read(mii->dev, swport, PORTREG_PCR2); + val &= ~(3 << PCR2_MODE_SHIFT); + val |= (PCR2_MODE_SECURE << PCR2_MODE_SHIFT); + mii->write(mii->dev, swport, PORTREG_PCR2, val); +} + +void fbxgw_sw_port_forward_enable(struct mii_struct *mii, int swport) +{ + u16 val; + + /* enable forwarding */ + val = mii->read(mii->dev, swport, PORTREG_PCR); + val |= PCR_PORTSTATE_FORWARDING; + mii->write(mii->dev, swport, PORTREG_PCR, val); +} --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/fbxgw-switch.h 2013-09-03 14:19:32.486089364 +0200 @@ -0,0 +1,51 @@ +/* + * fbxgw-switch.h for fbxgw-switch.h + * Created by on Tue Jun 5 20:46:37 2012 + */ + +#ifndef __FBXGW_SWITCH_H +# define __FBXGW_SWITCH_H + +struct mii_struct { + u16 dev_id; + bool indirect_phy_access; + struct net_device *dev; + int (*read)(struct net_device *dev, int phy_id, int reg); + void (*write)(struct net_device *dev, int phy_id, int reg, int val); +}; + + + + +void fbxgw_sw_vtu_stu_init(struct mii_struct *mii, int port_state, + size_t nr_ports); + +void fbxgw_sw_vtu_load(struct mii_struct *mii, u16 vid, const u8 *ports, + size_t nr_ports); + +void fbxgw_sw_config_cpu_port(struct mii_struct *mii, int swport); + +void fbxgw_sw_config_phy_port(struct mii_struct *mii, int phy_port); + +void fbxgw_sw_port_default_vid(struct mii_struct *mii, int swport, u16 vid); + +void fbxgw_sw_port_dot1q_secure(struct mii_struct *mii, int swport); + +void fbxgw_sw_port_forward_enable(struct mii_struct *mii, int swport); + +#define SWPORT(X) ((X) + 0x10) +#define PHYPORT(X) (X) + + +#define PORTREG_SWITCH_IDENTIFIER 0x3 +#define PRODUCT_NUM(x) (((x) >> 4) & 0xfff) + + +#define PDATA_MEMBER_UNMODIFIED 0 +#define PDATA_MEMBER_UNTAGGED 1 +#define PDATA_MEMBER_TAGGED 2 +#define PDATA_NOT_MEMBER 3 + +#define PCR_PORTSTATE_FORWARDING 3 + +#endif /* !__FBXGW_SWITCH_H */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/include/mach/board_fbxgw1r.h 2013-09-03 14:19:32.486089364 +0200 @@ -0,0 +1,41 @@ +#ifndef BOARD_FBXGW1R_H_ +#define BOARD_FBXGW1R_H_ + +/* + * board gpios + */ +#define GPIO_OLED_DATA_SELECT 7 +#define GPIO_SR_CLK 10 +#define GPIO_BCM_DOWN 11 +#define GPIO_SR_DIN 12 +#define GPIO_TEST_MODE 13 +#define GPIO_SFP_TXDIS 14 +#define GPIO_SR_LOAD 17 +#define GPIO_SW_RESET 28 +#define GPIO_SW_INT 29 +#define GPIO_SFP_PWRGOOD 34 +#define GPIO_SFP_TXFAULT 35 +#define GPIO_SPI_CS_BCM 36 +#define GPIO_SFP_PRESENCE 37 +#define GPIO_SFP_RXLOSS 38 +#define GPIO_BOARD_ID_0 43 +#define GPIO_EXP_RST 44 +#define GPIO_POS_SENSE 45 +#define GPIO_EXP_PWRGOOD 46 +#define GPIO_EXP_PRESENCE 47 +#define GPIO_KP_INT 48 +#define GPIO_BOARD_ID_1 49 + +/* + * shift register outputs + */ +#define SROUT_SFP_PWREN 0 +#define SROUT_USB_RST 1 +#define SROUT_AUDIO_RST 2 +#define SROUT_EXP_PWREN 3 +#define SROUT_BCM_RST 4 +#define SROUT_PCIE_RST 5 +#define SROUT_KEYPAD_OLED_RST 6 +#define SROUT_OLED_PWREN 7 + +#endif /* !BOARD_FBXGW1R_H_ */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/arch/arm/mach-kirkwood/include/mach/board_fbxgw2r.h 2013-09-03 14:19:32.486089364 +0200 @@ -0,0 +1,31 @@ +/* + * board_fbxgw2r.h for fbxgw2r + * Created by on Wed May 30 18:35:25 2012 + */ + +#ifndef __BOARD_FBXGW2R_H +# define __BOARD_FBXGW2R_H + +#define GPIO_OLED_DATA_SELECT 7 +#define GPIO_SFP_TXDIS 12 +#define GPIO_TEST_MODE 13 +#define GPIO_WLAN_RST 14 +#define GPIO_PCIE_RST 17 +#define GPIO_EXP_PWREN 22 +#define GPIO_SW_RESET 28 +#define GPIO_SW_INT 29 +#define GPIO_BCM_RST 30 +#define GPIO_SFP_PRESENCE 31 +#define GPIO_SFP_PWRGOOD 32 +#define GPIO_SFP_TXFAULT 35 +#define GPIO_AUDIO_RST 33 +#define GPIO_SPI_CS_BCM 34 +#define GPIO_SFP_RXLOSS 38 +#define GPIO_EXP_RST 44 +#define GPIO_POS_SENSE 45 +#define GPIO_EXP_PWRGOOD 46 +#define GPIO_EXP_PRESENCE 47 +#define GPIO_KP_INT 48 +#define GPIO_SFP_PWREN 49 + +#endif /* __BOARD_FBXGW2R_H */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/config 2014-04-17 17:34:40.292215702 +0200 @@ -0,0 +1,2971 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/arm 3.6.7 Kernel Configuration +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_VECTORS_BASE=0xffff0000 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set +CONFIG_NEED_MACH_IO_H=y +CONFIG_PHYS_OFFSET=0x0 +CONFIG_GENERIC_BUG=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_HAVE_IRQ_WORK=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="/opt/toolchains/armeabi-uclibc-std-0.9.30.2-gcc-4.6.0-binutils-2.20.1/bin/arm-linux-" +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_HAVE_KERNEL_XZ=y +CONFIG_HAVE_KERNEL_LZO=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_LZMA is not set +# CONFIG_KERNEL_XZ is not set +# CONFIG_KERNEL_LZO is not set +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_FHANDLE is not set +# CONFIG_TASKSTATS is not set +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +# CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_KTIME_SCALAR=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +# CONFIG_NO_HZ is not set +CONFIG_HIGH_RES_TIMERS=y + +# +# RCU Subsystem +# +CONFIG_TINY_RCU=y +# CONFIG_PREEMPT_RCU is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_FBX_DECRYPT_INITRD is not set +CONFIG_CGROUPS=y +# CONFIG_CGROUP_DEBUG is not set +# CONFIG_CGROUP_FREEZER is not set +# CONFIG_CGROUP_DEVICE is not set +# CONFIG_CPUSETS is not set +# CONFIG_CGROUP_CPUACCT is not set +# CONFIG_RESOURCE_COUNTERS is not set +# CONFIG_CGROUP_SCHED is not set +# CONFIG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set +# CONFIG_NAMESPACES is not set +# CONFIG_SCHED_AUTOGROUP is not set +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_RD_GZIP is not set +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_XZ is not set +# CONFIG_RD_LZO is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EXPERT=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_EMBEDDED=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_PERF_USE_VMALLOC=y + +# +# Kernel Performance Events And Counters +# +# CONFIG_PERF_EVENTS is not set +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_PCI_QUIRKS=y +# CONFIG_SLUB_DEBUG is not set +CONFIG_COMPAT_BRK=y +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +# CONFIG_JUMP_LABEL is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_SECCOMP_FILTER_JIT=y +CONFIG_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER_JIT=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_BLOCK=y +CONFIG_LBDAF=y +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_BSGLIB is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +# CONFIG_FREEZER is not set + +# +# System Type +# +CONFIG_MMU=y +# CONFIG_ARCH_SOCFPGA is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_HIGHBANK is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CNS3XXX is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_PRIMA2 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_MXS is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_MVEBU is not set +# CONFIG_ARCH_DOVE is not set +CONFIG_ARCH_KIRKWOOD=y +# CONFIG_ARCH_LPC32XX is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_PICOXCELL is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_SHMOBILE is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C24XX is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5P64X0 is not set +# CONFIG_ARCH_S5PC100 is not set +# CONFIG_ARCH_S5PV210 is not set +# CONFIG_ARCH_EXYNOS is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_U8500 is not set +# CONFIG_ARCH_NOMADIK is not set +# CONFIG_ARCH_DAVINCI is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_PLAT_SPEAR is not set +# CONFIG_ARCH_VT8500 is not set +# CONFIG_ARCH_ZYNQ is not set +# CONFIG_GPIO_PCA953X is not set + +# +# Marvell Kirkwood Implementations +# +# CONFIG_MACH_DB88F6281_BP is not set +# CONFIG_MACH_RD88F6192_NAS is not set +# CONFIG_MACH_RD88F6281 is not set +# CONFIG_MACH_MV88F6281GTW_GE is not set +# CONFIG_MACH_SHEEVAPLUG is not set +# CONFIG_MACH_ESATA_SHEEVAPLUG is not set +# CONFIG_MACH_GURUPLUG is not set +# CONFIG_ARCH_KIRKWOOD_DT is not set +# CONFIG_MACH_DREAMPLUG_DT is not set +# CONFIG_MACH_ICONNECT_DT is not set +# CONFIG_MACH_DLINK_KIRKWOOD_DT is not set +# CONFIG_MACH_IB62X0_DT is not set +# CONFIG_MACH_TS219_DT is not set +# CONFIG_MACH_GOFLEXNET_DT is not set +# CONFIG_MACH_LSXL_DT is not set +# CONFIG_MACH_TS219 is not set +# CONFIG_MACH_TS41X is not set +# CONFIG_MACH_DOCKSTAR is not set +# CONFIG_MACH_OPENRD_BASE is not set +# CONFIG_MACH_OPENRD_CLIENT is not set +# CONFIG_MACH_OPENRD_ULTIMATE is not set +# CONFIG_MACH_NETSPACE_V2 is not set +# CONFIG_MACH_INETSPACE_V2 is not set +# CONFIG_MACH_NETSPACE_MAX_V2 is not set +# CONFIG_MACH_D2NET_V2 is not set +# CONFIG_MACH_NET2BIG_V2 is not set +# CONFIG_MACH_NET5BIG_V2 is not set +# CONFIG_MACH_T5325 is not set +CONFIG_MACH_FBXGW1R=y +CONFIG_MACH_FBXGW1R_ETHSW_CONFIG=y +CONFIG_MACH_FBXGW1R_ETHSW_CONFIG_VLAN=y +# CONFIG_MACH_FBXGW1R_EXPANSION_BOARD_SETUP is not set +CONFIG_MACH_FBXGW2R=y +CONFIG_MACH_FBXGW2R_ETHSW_CONFIG=y +CONFIG_MACH_FBXGW2R_ETHSW_CONFIG_VLAN=y +# CONFIG_MACH_FBXGW2R_EXPANSION_BOARD_SETUP is not set +CONFIG_FBXGW_COMMON=y +CONFIG_FBXGW_COMMON_PARTS_WRITE_ALL=y +# CONFIG_FBXGW_COMMON_NAND_SAFE_READ_TIMINGS is not set +# CONFIG_FBXGW_COMMON_NAND_SAFE_WRITE_TIMINGS is not set +CONFIG_FBXGW_COMMON_I2C_25K=y +# CONFIG_FBXGW_COMMON_I2C_50K is not set +# CONFIG_FBXGW_COMMON_I2C_100K is not set +# CONFIG_MACH_RD88F6282A is not set +# CONFIG_MACH_DB88F6282A_BP is not set +CONFIG_PLAT_ORION=y + +# +# Processor Type +# +CONFIG_CPU_FEROCEON=y +# CONFIG_CPU_FEROCEON_OLD_ID is not set +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_PABRT_LEGACY=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_FEROCEON=y +CONFIG_CPU_TLB_FEROCEON=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y +CONFIG_CPU_USE_DOMAINS=y + +# +# Processor Features +# +# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set +# CONFIG_ARM_THUMB is not set +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_OUTER_CACHE=y +CONFIG_CACHE_FEROCEON_L2=y +# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set +# CONFIG_CACHE_L2X0 is not set +CONFIG_ARM_L1_CACHE_SHIFT=5 +CONFIG_ARM_NR_BANKS=8 + +# +# Bus support +# +CONFIG_PCI=y +CONFIG_PCI_SYSCALL=y +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set +# CONFIG_PCI_STUB is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCI_PRI is not set +# CONFIG_PCI_PASID is not set +CONFIG_HOTPLUG_PCI=y +# CONFIG_HOTPLUG_PCI_FAKE is not set +# CONFIG_HOTPLUG_PCI_CPCI is not set +# CONFIG_HOTPLUG_PCI_SHPC is not set +CONFIG_PCIEPORTBUS=y +CONFIG_HOTPLUG_PCI_PCIE=y +CONFIG_PCIEAER=y +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIEASPM is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_VMSPLIT_3G is not set +CONFIG_VMSPLIT_2G=y +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0x80000000 +CONFIG_ARCH_NR_GPIO=0 +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_PREEMPT_COUNT=y +CONFIG_HZ=100 +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +CONFIG_HAVE_ARCH_PFN_VALID=y +# CONFIG_HIGHMEM is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=999999 +# CONFIG_COMPACTION is not set +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +# CONFIG_CROSS_MEMORY_ATTACH is not set +CONFIG_NEED_PER_CPU_KM=y +# CONFIG_CLEANCACHE is not set +# CONFIG_FRONTSWAP is not set +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set +CONFIG_SECCOMP=y +# CONFIG_CC_STACKPROTECTOR is not set +# CONFIG_DEPRECATED_PARAM_STRUCT is not set + +# +# Boot options +# +# CONFIG_USE_OF is not set +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="root=/dev/nfs ro ip=:::::eth0.41:dhcp console=ttyS1,115200 user_debug=29 dhcpclass=linux-fbxgw2r" +# CONFIG_CMDLINE_FROM_BOOTLOADER is not set +# CONFIG_CMDLINE_EXTEND is not set +CONFIG_CMDLINE_FORCE=y +# CONFIG_XIP_KERNEL is not set +# CONFIG_KEXEC is not set +# CONFIG_CRASH_DUMP is not set +CONFIG_AUTO_ZRELADDR=y + +# +# CPU Power Management +# +# CONFIG_CPU_IDLE is not set +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +# CONFIG_VFP is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +# CONFIG_PM_RUNTIME is not set +# CONFIG_ARM_CPU_SUSPEND is not set +# CONFIG_ARM_BPF_JIT_HARDEN is not set +CONFIG_NET=y + +# +# Networking options +# +CONFIG_NETSKBPAD=40 +CONFIG_NETRXTHREAD=y +CONFIG_NETRXTHREAD_RX_QUEUE=2 +CONFIG_PACKET=y +CONFIG_UNIX=y +# CONFIG_UNIX_DIAG is not set +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=y +CONFIG_XFRM_USER=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE is not set +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +# CONFIG_IP_FIB_TRIE_STATS is not set +CONFIG_IP_MULTIPLE_TABLES=y +# CONFIG_IP_ROUTE_MULTIPATH is not set +# CONFIG_IP_ROUTE_VERBOSE is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +CONFIG_NET_IPGRE_DEMUX=y +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_NET_IPVTI is not set +CONFIG_INET_AH=y +CONFIG_INET_ESP=y +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +CONFIG_INET_TUNNEL=y +CONFIG_INET_XFRM_GC_THRESH=1024 +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +# CONFIG_INET_XFRM_MODE_BEET is not set +CONFIG_INET_LRO=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_INET_UDP_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=y +# CONFIG_IPV6_PRIVACY is not set +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_INET6_XFRM_TUNNEL is not set +# CONFIG_INET6_TUNNEL is not set +# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET6_XFRM_MODE_TUNNEL is not set +# CONFIG_INET6_XFRM_MODE_BEET is not set +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=y +# CONFIG_IPV6_SIT_6RD is not set +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_SIT_FBX6TO4=y +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +# CONFIG_BRIDGE_NETFILTER is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK_ACCT is not set +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +# CONFIG_NETFILTER_NETLINK_LOG is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_CONNTRACK_MARK is not set +CONFIG_NF_CONNTRACK_PROCFS=y +# CONFIG_NF_CONNTRACK_EVENTS is not set +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +# CONFIG_NF_CONNTRACK_TIMESTAMP is not set +# CONFIG_NF_CT_PROTO_DCCP is not set +CONFIG_NF_CT_PROTO_GRE=m +# CONFIG_NF_CT_PROTO_SCTP is not set +# CONFIG_NF_CT_PROTO_UDPLITE is not set +# CONFIG_NF_CONNTRACK_AMANDA is not set +CONFIG_NF_CONNTRACK_FTP=y +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set +# CONFIG_NF_CONNTRACK_SNMP is not set +CONFIG_NF_CONNTRACK_PPTP=m +# CONFIG_NF_CONNTRACK_SANE is not set +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=y +# CONFIG_NF_CT_NETLINK is not set +# CONFIG_NF_CT_NETLINK_TIMEOUT is not set +CONFIG_NETFILTER_TPROXY=y +CONFIG_NETFILTER_XTABLES=y + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=y +# CONFIG_NETFILTER_XT_CONNMARK is not set + +# +# Xtables targets +# +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +CONFIG_NETFILTER_XT_TARGET_DSCP=y +# CONFIG_NETFILTER_XT_TARGET_HL is not set +# CONFIG_NETFILTER_XT_TARGET_HMARK is not set +# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set +# CONFIG_NETFILTER_XT_TARGET_LED is not set +# CONFIG_NETFILTER_XT_TARGET_LOG is not set +CONFIG_NETFILTER_XT_TARGET_MARK=y +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +# CONFIG_NETFILTER_XT_TARGET_TEE is not set +CONFIG_NETFILTER_XT_TARGET_TPROXY=y +CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set + +# +# Xtables matches +# +# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set +# CONFIG_NETFILTER_XT_MATCH_CPU is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set +CONFIG_NETFILTER_XT_MATCH_DSCP=y +# CONFIG_NETFILTER_XT_MATCH_ECN is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set +# CONFIG_NETFILTER_XT_MATCH_HL is not set +CONFIG_NETFILTER_XT_MATCH_IPRANGE=y +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +CONFIG_NETFILTER_XT_MATCH_LIMIT=y +CONFIG_NETFILTER_XT_MATCH_MAC=y +CONFIG_NETFILTER_XT_MATCH_MARK=y +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set +CONFIG_NETFILTER_XT_MATCH_OWNER=y +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set +CONFIG_NETFILTER_XT_MATCH_STATE=y +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_TIME is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_FFN=y +# CONFIG_IP_FFN_PROCFS is not set +CONFIG_NF_DEFRAG_IPV4=y +CONFIG_NF_CONNTRACK_IPV4=y +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=y +# CONFIG_IP_NF_MATCH_AH is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_RPFILTER is not set +# CONFIG_IP_NF_MATCH_TTL is not set +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +# CONFIG_IP_NF_TARGET_ULOG is not set +CONFIG_NF_NAT=y +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +# CONFIG_IP_NF_TARGET_NETMAP is not set +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_FTP=y +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=y +# CONFIG_NF_NAT_AMANDA is not set +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=y +# CONFIG_IP_NF_TARGET_CLUSTERIP is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_DEFRAG_IPV6=y +# CONFIG_NF_CONNTRACK_IPV6 is not set +CONFIG_IP6_NF_IPTABLES=y +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_RPFILTER is not set +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_TARGET_HL is not set +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_TARGET_REJECT=y +CONFIG_IP6_NF_MANGLE=y +# CONFIG_IP6_NF_RAW is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_L2TP is not set +CONFIG_FBXATM=y +CONFIG_FBXATM_REMOTE=y +CONFIG_FBXATM_STACK=y +# CONFIG_FBXATM_REMOTE_STUB is not set +CONFIG_FBXATM_REMOTE_DRIVER=y +CONFIG_STP=y +CONFIG_BRIDGE=y +# CONFIG_BRIDGE_IGMP_SNOOPING is not set +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=y +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_DECNET is not set +CONFIG_LLC=y +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_PHONET is not set +# CONFIG_IEEE802154 is not set +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_CBQ is not set +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +CONFIG_NET_SCH_PRIO=y +CONFIG_NET_SCH_MULTIQ=y +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +CONFIG_NET_SCH_SFQ=y +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_DSMARK is not set +# CONFIG_NET_SCH_NETEM is not set +CONFIG_NET_SCH_DRR=y +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set +# CONFIG_NET_SCH_CODEL is not set +CONFIG_NET_SCH_FQ_CODEL=y +CONFIG_NET_SCH_INGRESS=y +# CONFIG_NET_SCH_PLUG is not set + +# +# Classification +# +CONFIG_NET_CLS=y +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_TCINDEX is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +CONFIG_NET_CLS_U32=y +# CONFIG_CLS_U32_PERF is not set +CONFIG_CLS_U32_MARK=y +# CONFIG_NET_CLS_RSVP is not set +# CONFIG_NET_CLS_RSVP6 is not set +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=y +# CONFIG_NET_ACT_GACT is not set +# CONFIG_NET_ACT_MIRRED is not set +# CONFIG_NET_ACT_IPT is not set +# CONFIG_NET_ACT_NAT is not set +# CONFIG_NET_ACT_PEDIT is not set +# CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_ACT_SKBEDIT=y +# CONFIG_NET_ACT_CSUM is not set +# CONFIG_NET_CLS_IND is not set +CONFIG_NET_SCH_FIFO=y +# CONFIG_DCB is not set +# CONFIG_BATMAN_ADV is not set +# CONFIG_OPENVSWITCH is not set +# CONFIG_NETPRIO_CGROUP is not set +CONFIG_BQL=y +CONFIG_BPF_JIT=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_IRDA is not set +CONFIG_BT=y +# CONFIG_BT_RFCOMM is not set +CONFIG_BT_BNEP=y +# CONFIG_BT_BNEP_MC_FILTER is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +# CONFIG_BT_HIDP is not set + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIBTUSB=y +# CONFIG_BT_HCIUART is not set +CONFIG_BT_HCIBCM203X=y +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIVHCI is not set +CONFIG_BT_MRVL=y +CONFIG_BT_ATH3K=y +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_CFG80211=y +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_REG_DEBUG is not set +# CONFIG_CFG80211_CERTIFICATION_ONUS is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +CONFIG_CFG80211_INTERNAL_REGDB=y +# CONFIG_CFG80211_WEXT is not set +# CONFIG_LIB80211 is not set +CONFIG_MAC80211=y +CONFIG_MAC80211_HAS_RC=y +# CONFIG_MAC80211_RC_PID is not set +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL_HT=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +# CONFIG_MAC80211_MESH is not set +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_MESSAGE_TRACING is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +# CONFIG_WIMAX is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set +# CONFIG_CAIF is not set +# CONFIG_CEPH_LIB is not set +# CONFIG_NFC is not set +CONFIG_HAVE_BPF_JIT=y + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_SPI=y +# CONFIG_DMA_SHARED_BUFFER is not set +# CONFIG_CMA is not set +# CONFIG_CONNECTOR is not set +CONFIG_FREEBOX_PROCFS=y +CONFIG_MTD=y +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_ERASE_PRINTK=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set +# CONFIG_MTD_FBX6HD_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set +# CONFIG_MTD_SWAP is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_DATAFLASH is not set +CONFIG_MTD_M25P80=y +# CONFIG_M25PXX_USE_FAST_READ is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +# CONFIG_MTD_DOCG3 is not set +CONFIG_MTD_NAND_ECC=y +# CONFIG_MTD_NAND_ECC_SMC is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +CONFIG_MTD_NAND_BCH=y +CONFIG_MTD_NAND_ECC_BCH=y +# CONFIG_MTD_SM_COMMON is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_FORCE_BAD_BLOCK_ERASE is not set +# CONFIG_MTD_NAND_DENALI is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_RICOH is not set +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_DOCG4 is not set +# CONFIG_MTD_NAND_CAFE is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +CONFIG_MTD_NAND_ORION=y +# CONFIG_MTD_NAND_DENALI_FBX is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set +# CONFIG_FREEBOX_MTD is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +# CONFIG_BLK_DEV_CRYPTOLOOP is not set + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_NVME is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=1 +CONFIG_BLK_DEV_RAM_SIZE=16384 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_MG_DISK is not set +# CONFIG_BLK_DEV_RBD is not set + +# +# Misc devices +# +# CONFIG_WINTEGRA_MMAP is not set +# CONFIG_SENSORS_LIS3LV02D is not set +# CONFIG_AD525X_DPOT is not set +# CONFIG_ATMEL_PWM is not set +# CONFIG_PHANTOM is not set +# CONFIG_INTEL_MID_PTI is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_HP_ILO is not set +# CONFIG_APDS9802ALS is not set +# CONFIG_ISL29003 is not set +# CONFIG_ISL29020 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_SENSORS_BH1780 is not set +# CONFIG_SENSORS_BH1770 is not set +# CONFIG_SENSORS_APDS990X is not set +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_INTELCE_PIC16PMU is not set +# CONFIG_BMP085_I2C is not set +# CONFIG_BMP085_SPI is not set +# CONFIG_PCH_PHUB is not set +# CONFIG_USB_SWITCH_FSA9480 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_EEPROM_93XX46 is not set +# CONFIG_CB710_CORE is not set + +# +# Texas Instruments shared transport line discipline +# +# CONFIG_TI_ST is not set +# CONFIG_SENSORS_LIS3_SPI is not set +# CONFIG_SENSORS_LIS3_I2C is not set + +# +# Altera FPGA firmware download module +# +# CONFIG_ALTERA_STAPL is not set + +# +# RemoTI support +# + +# +# HDMI CEC support +# +# CONFIG_HDMI_CEC is not set +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +# CONFIG_SCSI_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +# CONFIG_BLK_DEV_SR is not set +CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SCH is not set +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +CONFIG_SCSI_SCAN_ASYNC=y + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +# CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_SCSI_DH is not set +# CONFIG_SCSI_OSD_INITIATOR is not set +CONFIG_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +# CONFIG_SATA_AHCI is not set +# CONFIG_SATA_AHCI_PLATFORM is not set +# CONFIG_SATA_INIC162X is not set +# CONFIG_SATA_ACARD_AHCI is not set +# CONFIG_SATA_SIL24 is not set +CONFIG_ATA_SFF=y + +# +# SFF controllers with custom DMA interface +# +# CONFIG_PDC_ADMA is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_SX4 is not set +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# +# CONFIG_ATA_PIIX is not set +CONFIG_SATA_MV=m +# CONFIG_SATA_NV is not set +# CONFIG_SATA_PROMISE is not set +# CONFIG_SATA_SIL is not set +# CONFIG_SATA_SIS is not set +# CONFIG_SATA_SVW is not set +# CONFIG_SATA_ULI is not set +# CONFIG_SATA_VIA is not set +# CONFIG_SATA_VITESSE is not set + +# +# PATA SFF controllers with BMDMA +# +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_ATP867X is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +# CONFIG_PATA_CS5536 is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IT8213 is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_MARVELL is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NINJA32 is not set +# CONFIG_PATA_NS87415 is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RDC is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SCH is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_TOSHIBA is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set + +# +# PIO-only SFF controllers +# +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_PLATFORM is not set +# CONFIG_PATA_RZ1000 is not set + +# +# Generic fallback / legacy drivers +# +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_LEGACY is not set +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +CONFIG_BLK_DEV_DM=y +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=y +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_THIN_PROVISIONING is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_RAID is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_UEVENT is not set +# CONFIG_DM_FLAKEY is not set +# CONFIG_DM_VERITY is not set +# CONFIG_TARGET_CORE is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_FIREWIRE is not set +# CONFIG_FIREWIRE_NOSY is not set +# CONFIG_I2O is not set +CONFIG_NETDEVICES=y +CONFIG_NET_CORE=y +# CONFIG_BONDING is not set +CONFIG_DUMMY=y +# CONFIG_EQUALIZER is not set +# CONFIG_NET_FC is not set +CONFIG_MII=y +# CONFIG_IFB is not set +# CONFIG_NET_TEAM is not set +# CONFIG_MACVLAN is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_TUN=y +# CONFIG_VETH is not set +# CONFIG_ARCNET is not set + +# +# CAIF transport drivers +# +CONFIG_ETHERNET=y +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_ADAPTEC is not set +# CONFIG_NET_VENDOR_ALTEON is not set +# CONFIG_NET_VENDOR_AMD is not set +# CONFIG_NET_VENDOR_ATHEROS is not set +CONFIG_NET_VENDOR_BROADCOM=y +# CONFIG_B44 is not set +# CONFIG_BNX2 is not set +# CONFIG_CNIC is not set +# CONFIG_TIGON3 is not set +# CONFIG_BNX2X is not set +# CONFIG_NET_VENDOR_BROCADE is not set +# CONFIG_NET_CALXEDA_XGMAC is not set +# CONFIG_NET_VENDOR_CHELSIO is not set +# CONFIG_NET_VENDOR_CIRRUS is not set +# CONFIG_NET_VENDOR_CISCO is not set +# CONFIG_DM9000 is not set +# CONFIG_DNET is not set +# CONFIG_NET_VENDOR_DEC is not set +# CONFIG_NET_VENDOR_DLINK is not set +# CONFIG_NET_VENDOR_EMULEX is not set +# CONFIG_NET_VENDOR_EXAR is not set +# CONFIG_NET_VENDOR_FARADAY is not set +# CONFIG_NET_VENDOR_HP is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_IP1000 is not set +# CONFIG_JME is not set +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MV643XX_ETH=y +# CONFIG_SKGE is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +# CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set +# CONFIG_NET_VENDOR_MYRI is not set +# CONFIG_FEALNX is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_NVIDIA is not set +# CONFIG_NET_VENDOR_OKI is not set +# CONFIG_ETHOC is not set +# CONFIG_NET_PACKET_ENGINE is not set +# CONFIG_NET_VENDOR_QLOGIC is not set +# CONFIG_NET_VENDOR_REALTEK is not set +# CONFIG_NET_VENDOR_RDC is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SILAN is not set +# CONFIG_NET_VENDOR_SIS is not set +# CONFIG_SFC is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_SUN is not set +# CONFIG_NET_VENDOR_TEHUTI is not set +# CONFIG_NET_VENDOR_TI is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WIZNET is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +# CONFIG_AMD_PHY is not set +# CONFIG_MARVELL_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_BCM87XX_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_REALTEK_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_MICREL_PHY is not set +# CONFIG_FIXED_PHY is not set +# CONFIG_MDIO_BITBANG is not set +# CONFIG_MICREL_KS8995MA is not set +CONFIG_PPP=y +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_MPPE=y +# CONFIG_PPP_MULTILINK is not set +CONFIG_PPPOE=y +CONFIG_PPTP=y +# CONFIG_PPP_ASYNC is not set +# CONFIG_PPP_SYNC_TTY is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=y + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set +# CONFIG_USB_IPHETH is not set +CONFIG_WLAN=y +# CONFIG_LIBERTAS_THINFIRM is not set +# CONFIG_ATMEL is not set +# CONFIG_AT76C50X_USB is not set +# CONFIG_PRISM54 is not set +# CONFIG_USB_ZD1201 is not set +# CONFIG_USB_NET_RNDIS_WLAN is not set +# CONFIG_RTL8180 is not set +# CONFIG_RTL8187 is not set +# CONFIG_ADM8211 is not set +# CONFIG_MAC80211_HWSIM is not set +CONFIG_MWL8K=m +# CONFIG_MWL8K_MFG is not set +CONFIG_ATH_COMMON=y +# CONFIG_ATH_DEBUG is not set +# CONFIG_ATH5K is not set +# CONFIG_ATH5K_PCI is not set +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +# CONFIG_ATH9K_AHB is not set +# CONFIG_ATH9K_DEBUGFS is not set +CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_HTC is not set +# CONFIG_CARL9170 is not set +# CONFIG_ATH6KL is not set +# CONFIG_B43 is not set +# CONFIG_B43LEGACY is not set +# CONFIG_BRCMFMAC is not set +# CONFIG_HOSTAP is not set +# CONFIG_IPW2100 is not set +# CONFIG_IWLWIFI is not set +# CONFIG_IWL4965 is not set +# CONFIG_IWL3945 is not set +# CONFIG_LIBERTAS is not set +# CONFIG_P54_COMMON is not set +# CONFIG_RT2X00 is not set +# CONFIG_RTL8192CE is not set +# CONFIG_RTL8192SE is not set +# CONFIG_RTL8192DE is not set +# CONFIG_RTL8192CU is not set +# CONFIG_WL_TI is not set +# CONFIG_ZD1211RW is not set +# CONFIG_MWIFIEX is not set + +# +# Enable WiMAX (Networking options) to see the WiMAX drivers +# +# CONFIG_WAN is not set +# CONFIG_VMXNET3 is not set +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +CONFIG_INPUT_POLLDEV=y +# CONFIG_INPUT_SPARSEKMAP is not set +# CONFIG_INPUT_MATRIXKMAP is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +CONFIG_INPUT_MISC=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_BMA150 is not set +# CONFIG_INPUT_MMA8450 is not set +# CONFIG_INPUT_MPU3050 is not set +# CONFIG_INPUT_GP2A is not set +# CONFIG_INPUT_GPIO_TILT_POLLED is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_KXTJ9 is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +# CONFIG_INPUT_UINPUT is not set +# CONFIG_INPUT_PCF8574 is not set +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_CMA3000 is not set +CONFIG_INPUT_SMSC_CAP1066=m + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=16 +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_NOZOMI is not set +# CONFIG_N_GSM is not set +# CONFIG_TRACE_SINK is not set +# CONFIG_DEVKMEM is not set +# CONFIG_DEVPHYSMEM is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_EM is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX3107 is not set +# CONFIG_SERIAL_MFD_HSU is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +# CONFIG_SERIAL_IFX6X60 is not set +# CONFIG_SERIAL_PCH_UART is not set +# CONFIG_SERIAL_XILINX_PS_UART is not set +# CONFIG_TTY_PRINTK is not set +# CONFIG_HVC_DCC is not set +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_DEVPORT=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_ISCH is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_DESIGNWARE_PLATFORM is not set +# CONFIG_I2C_DESIGNWARE_PCI is not set +# CONFIG_I2C_EG20T is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_INTEL_MID is not set +CONFIG_I2C_MV64XXX=y +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_PXA_PCI is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_DIOLAN_U2C is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +CONFIG_SPI=y +CONFIG_SPI_DEBUG=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_OC_TINY is not set +CONFIG_SPI_ORION=y +CONFIG_SPI_TDM_ORION=y +# CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set +# CONFIG_HSI is not set + +# +# PPS support +# +# CONFIG_PPS is not set + +# +# PPS generators support +# + +# +# PTP clock support +# + +# +# Enable Device Drivers -> PPS to see the PTP clock options. +# +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_ARCH_REQUIRE_GPIOLIB=y +CONFIG_GPIOLIB=y +# CONFIG_DEBUG_GPIO is not set +# CONFIG_GPIO_SYSFS is not set + +# +# Memory mapped GPIO drivers: +# +# CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_EM is not set +# CONFIG_GPIO_VX855 is not set + +# +# I2C GPIO expanders: +# +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_SX150X is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# +# CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_AMD8111 is not set +# CONFIG_GPIO_ML_IOH is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set + +# +# AC97 GPIO expanders: +# + +# +# MODULbus GPIO expanders: +# +CONFIG_FREEBOX_GPIO=y +# CONFIG_FREEBOX_JTAG is not set +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +# CONFIG_POWER_AVS is not set +CONFIG_HWMON=y +CONFIG_HWMON_VID=y +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_AD7314 is not set +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADCXX is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7411 is not set +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +CONFIG_SENSORS_ADT7475=y +# CONFIG_SENSORS_ASC7621 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS620 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_I5K_AMB is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_GPIO_FAN is not set +# CONFIG_SENSORS_HIH6130 is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_JC42 is not set +# CONFIG_SENSORS_LINEAGE is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM73 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +CONFIG_SENSORS_LM85=y +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_LTC4151 is not set +# CONFIG_SENSORS_LTC4215 is not set +# CONFIG_SENSORS_LTC4245 is not set +# CONFIG_SENSORS_LTC4261 is not set +# CONFIG_SENSORS_LM95241 is not set +# CONFIG_SENSORS_LM95245 is not set +# CONFIG_SENSORS_MAX1111 is not set +# CONFIG_SENSORS_MAX16065 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX1668 is not set +# CONFIG_SENSORS_MAX6639 is not set +# CONFIG_SENSORS_MAX6642 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_MCP3021 is not set +# CONFIG_SENSORS_NTC_THERMISTOR is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_PMBUS is not set +# CONFIG_SENSORS_SHT15 is not set +# CONFIG_SENSORS_SHT21 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_SMM665 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_EMC1403 is not set +# CONFIG_SENSORS_EMC2103 is not set +# CONFIG_SENSORS_EMC6W201 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_SCH56XX_COMMON is not set +# CONFIG_SENSORS_ADS1015 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_ADS7871 is not set +# CONFIG_SENSORS_AMC6821 is not set +# CONFIG_SENSORS_INA2XX is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_TMP102 is not set +# CONFIG_SENSORS_TMP401 is not set +# CONFIG_SENSORS_TMP421 is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_VT8231 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83795 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +CONFIG_SENSORS_KIRKWOOD_CORETEMP=m +# CONFIG_THERMAL is not set +CONFIG_FREEBOX_WATCHDOG=y +CONFIG_FREEBOX_WATCHDOG_CHAR=y +CONFIG_FREEBOX_WATCHDOG_ORION=y +# CONFIG_WATCHDOG is not set +CONFIG_SSB_POSSIBLE=y + +# +# Sonics Silicon Backplane +# +# CONFIG_SSB is not set +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +# CONFIG_BCMA is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_CORE is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_88PM800 is not set +# CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set +# CONFIG_HTC_I2CPLD is not set +# CONFIG_MFD_LM3533 is not set +# CONFIG_TPS6105X is not set +# CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65217 is not set +# CONFIG_MFD_TPS65910 is not set +# CONFIG_MFD_TPS65912_I2C is not set +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_TWL6040_CORE is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_TC3589X is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_T7L66XB is not set +# CONFIG_MFD_TC6387XB is not set +# CONFIG_MFD_TC6393XB is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_DA9052_SPI is not set +# CONFIG_MFD_DA9052_I2C is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_MAX77686 is not set +# CONFIG_MFD_MAX77693 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_SEC_CORE is not set +# CONFIG_MFD_ARIZONA_I2C is not set +# CONFIG_MFD_ARIZONA_SPI is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM831X_SPI is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_MC13XXX_SPI is not set +# CONFIG_MFD_MC13XXX_I2C is not set +# CONFIG_ABX500_CORE is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MFD_TIMBERDALE is not set +# CONFIG_LPC_SCH is not set +# CONFIG_LPC_ICH is not set +# CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_VX855 is not set +# CONFIG_MFD_WL1273_CORE is not set +# CONFIG_MFD_TPS65090 is not set +# CONFIG_MFD_AAT2870_CORE is not set +# CONFIG_MFD_RC5T583 is not set +# CONFIG_MFD_PALMAS is not set +# CONFIG_REGULATOR is not set +CONFIG_MEDIA_SUPPORT=y + +# +# Multimedia core support +# +# CONFIG_MEDIA_CAMERA_SUPPORT is not set +# CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +# CONFIG_MEDIA_RADIO_SUPPORT is not set +CONFIG_MEDIA_RC_SUPPORT=y +CONFIG_DVB_CORE=y +# CONFIG_DVB_NET is not set + +# +# Media drivers +# +CONFIG_RC_CORE=y +# CONFIG_RC_MAP is not set +# CONFIG_RC_DECODERS is not set +# CONFIG_RC_DEVICES is not set +# CONFIG_MEDIA_ATTACH is not set +CONFIG_MEDIA_TUNER_MT2060=m +CONFIG_MEDIA_TUNER_MT2266=m +CONFIG_MEDIA_TUNER_XC2028=m +CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m +CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +# CONFIG_TTPCI_EEPROM is not set +# CONFIG_DVB_BUDGET_CORE is not set + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=y +# CONFIG_DVB_USB_DEBUG is not set +# CONFIG_DVB_USB_A800 is not set +# CONFIG_DVB_USB_DIBUSB_MB is not set +# CONFIG_DVB_USB_DIBUSB_MC is not set +CONFIG_DVB_USB_DIB0700=m +# CONFIG_DVB_USB_UMT_010 is not set +# CONFIG_DVB_USB_CXUSB is not set +# CONFIG_DVB_USB_M920X is not set +# CONFIG_DVB_USB_GL861 is not set +# CONFIG_DVB_USB_AU6610 is not set +# CONFIG_DVB_USB_DIGITV is not set +# CONFIG_DVB_USB_VP7045 is not set +# CONFIG_DVB_USB_VP702X is not set +# CONFIG_DVB_USB_GP8PSK is not set +# CONFIG_DVB_USB_NOVA_T_USB2 is not set +# CONFIG_DVB_USB_TTUSB2 is not set +# CONFIG_DVB_USB_DTT200U is not set +# CONFIG_DVB_USB_OPERA1 is not set +# CONFIG_DVB_USB_AF9005 is not set +# CONFIG_DVB_USB_PCTV452E is not set +# CONFIG_DVB_USB_DW2102 is not set +# CONFIG_DVB_USB_CINERGY_T2 is not set +# CONFIG_DVB_USB_ANYSEE is not set +# CONFIG_DVB_USB_DTV5100 is not set +# CONFIG_DVB_USB_AF9015 is not set +# CONFIG_DVB_USB_CE6230 is not set +# CONFIG_DVB_USB_FRIIO is not set +# CONFIG_DVB_USB_EC168 is not set +# CONFIG_DVB_USB_AZ6007 is not set +# CONFIG_DVB_USB_AZ6027 is not set +# CONFIG_DVB_USB_LME2510 is not set +# CONFIG_DVB_USB_TECHNISAT_USB2 is not set +# CONFIG_DVB_USB_IT913X is not set +# CONFIG_DVB_USB_MXL111SF is not set +# CONFIG_DVB_USB_RTL28XXU is not set +# CONFIG_DVB_USB_AF9035 is not set +# CONFIG_DVB_TTUSB_BUDGET is not set +# CONFIG_DVB_TTUSB_DEC is not set +# CONFIG_SMS_SIANO_MDTV is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +# CONFIG_DVB_B2C2_FLEXCOP is not set + +# +# Supported BT878 Adapters +# + +# +# Supported Pluto2 Adapters +# +# CONFIG_DVB_PLUTO2 is not set + +# +# Supported SDMC DM1105 Adapters +# +# CONFIG_DVB_DM1105 is not set + +# +# Supported Earthsoft PT1 Adapters +# +# CONFIG_DVB_PT1 is not set + +# +# Supported Mantis Adapters +# +# CONFIG_MANTIS_CORE is not set + +# +# Supported nGene Adapters +# +# CONFIG_DVB_NGENE is not set + +# +# Supported ddbridge ('Octopus') Adapters +# +# CONFIG_DVB_DDBRIDGE is not set + +# +# Supported DVB Frontends +# +CONFIG_DVB_FE_CUSTOMISE=y + +# +# Customise DVB Frontends +# + +# +# Multistandard (satellite) frontends +# +# CONFIG_DVB_STB0899 is not set +# CONFIG_DVB_STB6100 is not set +# CONFIG_DVB_STV090x is not set +# CONFIG_DVB_STV6110x is not set + +# +# Multistandard (cable + terrestrial) frontends +# +# CONFIG_DVB_DRXK is not set +# CONFIG_DVB_TDA18271C2DD is not set + +# +# DVB-S (satellite) frontends +# +# CONFIG_DVB_CX24110 is not set +# CONFIG_DVB_CX24123 is not set +# CONFIG_DVB_MT312 is not set +# CONFIG_DVB_ZL10036 is not set +# CONFIG_DVB_ZL10039 is not set +# CONFIG_DVB_S5H1420 is not set +# CONFIG_DVB_STV0288 is not set +# CONFIG_DVB_STB6000 is not set +# CONFIG_DVB_STV0299 is not set +# CONFIG_DVB_STV6110 is not set +# CONFIG_DVB_STV0900 is not set +# CONFIG_DVB_TDA8083 is not set +# CONFIG_DVB_TDA10086 is not set +# CONFIG_DVB_TDA8261 is not set +# CONFIG_DVB_VES1X93 is not set +# CONFIG_DVB_TUNER_ITD1000 is not set +# CONFIG_DVB_TUNER_CX24113 is not set +# CONFIG_DVB_TDA826X is not set +# CONFIG_DVB_TUA6100 is not set +# CONFIG_DVB_CX24116 is not set +# CONFIG_DVB_SI21XX is not set +# CONFIG_DVB_DS3000 is not set +# CONFIG_DVB_MB86A16 is not set +# CONFIG_DVB_TDA10071 is not set + +# +# DVB-T (terrestrial) frontends +# +# CONFIG_DVB_SP8870 is not set +# CONFIG_DVB_SP887X is not set +# CONFIG_DVB_CX22700 is not set +# CONFIG_DVB_CX22702 is not set +# CONFIG_DVB_S5H1432 is not set +# CONFIG_DVB_DRXD is not set +# CONFIG_DVB_L64781 is not set +# CONFIG_DVB_TDA1004X is not set +# CONFIG_DVB_NXT6000 is not set +# CONFIG_DVB_MT352 is not set +# CONFIG_DVB_ZL10353 is not set +# CONFIG_DVB_DIB3000MB is not set +# CONFIG_DVB_DIB3000MC is not set +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +# CONFIG_DVB_DIB9000 is not set +# CONFIG_DVB_TDA10048 is not set +# CONFIG_DVB_AF9013 is not set +# CONFIG_DVB_EC100 is not set +# CONFIG_DVB_HD29L2 is not set +# CONFIG_DVB_STV0367 is not set +# CONFIG_DVB_CXD2820R is not set +# CONFIG_DVB_RTL2830 is not set +# CONFIG_DVB_RTL2832 is not set + +# +# DVB-C (cable) frontends +# +# CONFIG_DVB_VES1820 is not set +# CONFIG_DVB_TDA10021 is not set +# CONFIG_DVB_TDA10023 is not set +# CONFIG_DVB_STV0297 is not set + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +# CONFIG_DVB_NXT200X is not set +# CONFIG_DVB_OR51211 is not set +# CONFIG_DVB_OR51132 is not set +# CONFIG_DVB_BCM3510 is not set +# CONFIG_DVB_LGDT330X is not set +# CONFIG_DVB_LGDT3305 is not set +# CONFIG_DVB_LG2160 is not set +# CONFIG_DVB_S5H1409 is not set +# CONFIG_DVB_AU8522_DTV is not set +# CONFIG_DVB_S5H1411 is not set + +# +# ISDB-T (terrestrial) frontends +# +# CONFIG_DVB_S921 is not set +# CONFIG_DVB_DIB8000 is not set +# CONFIG_DVB_MB86A20S is not set + +# +# Digital terrestrial only tuners/PLL +# +# CONFIG_DVB_PLL is not set +CONFIG_DVB_TUNER_DIB0070=m +# CONFIG_DVB_TUNER_DIB0090 is not set + +# +# SEC control devices for DVB-S +# +# CONFIG_DVB_LNBP21 is not set +# CONFIG_DVB_LNBP22 is not set +# CONFIG_DVB_ISL6405 is not set +# CONFIG_DVB_ISL6421 is not set +# CONFIG_DVB_ISL6423 is not set +# CONFIG_DVB_A8293 is not set +# CONFIG_DVB_LGS8GL5 is not set +# CONFIG_DVB_LGS8GXX is not set +# CONFIG_DVB_ATBM8830 is not set +# CONFIG_DVB_TDA665x is not set +# CONFIG_DVB_IX2505V is not set +# CONFIG_DVB_IT913X_FE is not set +# CONFIG_DVB_M88RS2000 is not set +# CONFIG_DVB_AF9033 is not set + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +# CONFIG_VGA_ARB is not set +# CONFIG_DRM is not set +# CONFIG_STUB_POULSBO is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +# CONFIG_FB_CFB_FILLRECT is not set +# CONFIG_FB_CFB_COPYAREA is not set +# CONFIG_FB_CFB_IMAGEBLIT is not set +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYS_FOPS=y +# CONFIG_FB_WMT_GE_ROPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +CONFIG_FB_BACKLIGHT=y +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +CONFIG_FB_SSD1327=y +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_SMSCUFX is not set +# CONFIG_FB_UDL is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set +# CONFIG_EXYNOS_VIDEO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +# CONFIG_BACKLIGHT_LP855X is not set + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE is not set +# CONFIG_LOGO is not set +CONFIG_SOUND=y +# CONFIG_SOUND_OSS_CORE is not set +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_RAWMIDI=y +CONFIG_SND_JACK=y +# CONFIG_SND_SEQUENCER is not set +# CONFIG_SND_MIXER_OSS is not set +# CONFIG_SND_PCM_OSS is not set +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_VERBOSE_PROCFS=y +CONFIG_SND_VERBOSE_PRINTK=y +# CONFIG_SND_DEBUG is not set +# CONFIG_SND_RAWMIDI_SEQ is not set +# CONFIG_SND_OPL3_LIB_SEQ is not set +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +# CONFIG_SND_EMU10K1_SEQ is not set +# CONFIG_SND_DRIVERS is not set +# CONFIG_SND_PCI is not set +# CONFIG_SND_ARM is not set +# CONFIG_SND_SPI is not set +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=y +# CONFIG_SND_USB_UA101 is not set +# CONFIG_SND_USB_CAIAQ is not set +# CONFIG_SND_USB_6FIRE is not set +CONFIG_SND_SOC=y +# CONFIG_SND_DESIGNWARE_I2S is not set +CONFIG_SND_KIRKWOOD_SOC=m +CONFIG_SND_KIRKWOOD_SOC_I2S=m +CONFIG_SND_KIRKWOOD_SOC_FBXGW2R=m +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_CS42L52=m +# CONFIG_SND_SIMPLE_CARD is not set +# CONFIG_SOUND_PRIME is not set + +# +# HID support +# +CONFIG_HID=y +# CONFIG_HIDRAW is not set +# CONFIG_UHID is not set +# CONFIG_HID_GENERIC is not set + +# +# Special HID drivers +# + +# +# USB HID support +# +# CONFIG_USB_HID is not set +# CONFIG_HID_PID is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y + +# +# Miscellaneous USB options +# +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG_WHITELIST is not set +# CONFIG_USB_OTG_BLACKLIST_HUB is not set +# CONFIG_USB_MON is not set +# CONFIG_USB_WUSB_CBAF is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +# CONFIG_USB_XHCI_HCD is not set +CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_ROOT_HUB_TT=y +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_ISP1760_HCD is not set +# CONFIG_USB_ISP1362_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_EHCI_HCD_PLATFORM is not set +# CONFIG_USB_UHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_CHIPIDEA is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=y +CONFIG_USB_PRINTER=y +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_REALTEK is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_STORAGE_ENE_UB6250 is not set +# CONFIG_USB_UAS is not set +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set + +# +# USB port drivers +# +CONFIG_USB_SERIAL=y +# CONFIG_USB_SERIAL_CONSOLE is not set +# CONFIG_USB_EZUSB is not set +# CONFIG_USB_SERIAL_GENERIC is not set +# CONFIG_USB_SERIAL_AIRCABLE is not set +# CONFIG_USB_SERIAL_ARK3116 is not set +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_CH341 is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set +CONFIG_USB_SERIAL_CP210X=y +# CONFIG_USB_SERIAL_CYPRESS_M8 is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set +# CONFIG_USB_SERIAL_FUNSOFT is not set +# CONFIG_USB_SERIAL_VISOR is not set +# CONFIG_USB_SERIAL_IPAQ is not set +# CONFIG_USB_SERIAL_IR is not set +# CONFIG_USB_SERIAL_EDGEPORT is not set +# CONFIG_USB_SERIAL_EDGEPORT_TI is not set +# CONFIG_USB_SERIAL_F81232 is not set +# CONFIG_USB_SERIAL_GARMIN is not set +# CONFIG_USB_SERIAL_IPW is not set +# CONFIG_USB_SERIAL_IUU is not set +# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set +# CONFIG_USB_SERIAL_KEYSPAN is not set +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_KOBIL_SCT is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set +# CONFIG_USB_SERIAL_METRO is not set +# CONFIG_USB_SERIAL_MOS7720 is not set +# CONFIG_USB_SERIAL_MOS7840 is not set +# CONFIG_USB_SERIAL_MOTOROLA is not set +# CONFIG_USB_SERIAL_NAVMAN is not set +# CONFIG_USB_SERIAL_PL2303 is not set +# CONFIG_USB_SERIAL_OTI6858 is not set +# CONFIG_USB_SERIAL_QCAUX is not set +# CONFIG_USB_SERIAL_QUALCOMM is not set +# CONFIG_USB_SERIAL_SPCP8X5 is not set +# CONFIG_USB_SERIAL_HP4X is not set +# CONFIG_USB_SERIAL_SAFE is not set +# CONFIG_USB_SERIAL_SIEMENS_MPI is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set +# CONFIG_USB_SERIAL_SYMBOL is not set +# CONFIG_USB_SERIAL_TI is not set +# CONFIG_USB_SERIAL_CYBERJACK is not set +# CONFIG_USB_SERIAL_XIRCOM is not set +# CONFIG_USB_SERIAL_OPTION is not set +# CONFIG_USB_SERIAL_OMNINET is not set +# CONFIG_USB_SERIAL_OPTICON is not set +# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set +# CONFIG_USB_SERIAL_ZIO is not set +# CONFIG_USB_SERIAL_SSU100 is not set +# CONFIG_USB_SERIAL_QT2 is not set +# CONFIG_USB_SERIAL_DEBUG is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_YUREX is not set + +# +# USB Physical Layer drivers +# +# CONFIG_USB_ISP1301 is not set +# CONFIG_USB_GADGET is not set + +# +# OTG and related infrastructure +# +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_USB_ULPI is not set +# CONFIG_NOP_USB_XCEIV is not set +# CONFIG_UWB is not set +# CONFIG_MMC is not set +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +# CONFIG_LEDS_LM3530 is not set +# CONFIG_LEDS_PCA9532 is not set +# CONFIG_LEDS_GPIO is not set +# CONFIG_LEDS_LP3944 is not set +# CONFIG_LEDS_LP5521 is not set +# CONFIG_LEDS_LP5523 is not set +# CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_PCA9633 is not set +# CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_BD2802 is not set +# CONFIG_LEDS_LT3593 is not set +# CONFIG_LEDS_RENESAS_TPU is not set +# CONFIG_LEDS_TCA6507 is not set +# CONFIG_LEDS_LM3556 is not set +# CONFIG_LEDS_OT200 is not set +# CONFIG_LEDS_BLINKM is not set +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +# CONFIG_LEDS_TRIGGER_TIMER is not set +# CONFIG_LEDS_TRIGGER_ONESHOT is not set +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +# CONFIG_LEDS_TRIGGER_GPIO is not set +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set + +# +# iptables trigger is under Netfilter config (LED target) +# +# CONFIG_LEDS_TRIGGER_TRANSIENT is not set +# CONFIG_FREEBOX_PANEL is not set +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=y +# CONFIG_RTC_CLASS is not set +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set + +# +# Virtio drivers +# +# CONFIG_VIRTIO_PCI is not set +# CONFIG_VIRTIO_BALLOON is not set +# CONFIG_VIRTIO_MMIO is not set + +# +# Microsoft Hyper-V guest support +# +# CONFIG_STAGING is not set +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Common Clock Framework +# +# CONFIG_COMMON_CLK_DEBUG is not set + +# +# Hardware Spinlock drivers +# +CONFIG_CLKSRC_MMIO=y +# CONFIG_IOMMU_SUPPORT is not set + +# +# Remoteproc drivers (EXPERIMENTAL) +# + +# +# Rpmsg drivers (EXPERIMENTAL) +# +# CONFIG_VIRT_DRIVERS is not set +# CONFIG_PM_DEVFREQ is not set +# CONFIG_EXTCON is not set +# CONFIG_MEMORY is not set +# CONFIG_IIO is not set +# CONFIG_VME_BUS is not set +# CONFIG_PWM is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT4_FS=y +# CONFIG_EXT4_FS_XATTR is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_DEBUG is not set +# CONFIG_GFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +# CONFIG_QUOTA is not set +# CONFIG_QUOTACTL is not set +# CONFIG_AUTOFS4_FS is not set +CONFIG_FUSE_FS=y +# CONFIG_CUSE is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +CONFIG_MSDOS_FS=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=850 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +CONFIG_NTFS_FS=y +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_TMPFS_XATTR is not set +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_RAMFS_XATTR is not set +# CONFIG_RAMFS_XATTR_USER is not set +# CONFIG_CONFIGFS_FS is not set +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +CONFIG_HFS_FS=y +CONFIG_HFSPLUS_FS=y +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_UBIFS_FS=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +# CONFIG_LOGFS is not set +CONFIG_CRAMFS=y +CONFIG_SQUASHFS=y +# CONFIG_SQUASHFS_XATTR is not set +CONFIG_SQUASHFS_ZLIB=y +# CONFIG_SQUASHFS_LZO is not set +# CONFIG_SQUASHFS_XZ is not set +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +# CONFIG_PSTORE_CONSOLE is not set +CONFIG_PSTORE_RAM=y +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V2=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_SWAP is not set +CONFIG_ROOT_NFS=y +CONFIG_NFSD=y +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +# CONFIG_SUNRPC_DEBUG is not set +# CONFIG_CEPH_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +CONFIG_NLS_CODEPAGE_850=y +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=y +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_MAC_ROMAN is not set +# CONFIG_NLS_MAC_CELTIC is not set +# CONFIG_NLS_MAC_CENTEURO is not set +# CONFIG_NLS_MAC_CROATIAN is not set +# CONFIG_NLS_MAC_CYRILLIC is not set +# CONFIG_NLS_MAC_GAELIC is not set +# CONFIG_NLS_MAC_GREEK is not set +# CONFIG_NLS_MAC_ICELAND is not set +# CONFIG_NLS_MAC_INUIT is not set +# CONFIG_NLS_MAC_ROMANIAN is not set +# CONFIG_NLS_MAC_TURKISH is not set +CONFIG_NLS_UTF8=y + +# +# Kernel hacking +# +CONFIG_PRINTK_TIME=y +CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_FRAME_WARN=1024 +CONFIG_MAGIC_SYSRQ=y +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_READABLE_ASM is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_LOCKUP_DETECTOR is not set +# CONFIG_HARDLOCKUP_DETECTOR is not set +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y +CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1 +# CONFIG_SCHED_DEBUG is not set +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_OBJECTS is not set +# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_KMEMLEAK is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_SPARSE_RCU_POINTER is not set +# CONFIG_LOCK_STAT is not set +CONFIG_DEBUG_ATOMIC_SLEEP=y +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set +CONFIG_DEBUG_MEMORY_INIT=y +CONFIG_DEBUG_LIST=y +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_DEBUG_CREDENTIALS is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_TRACE is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# CONFIG_LKDTM is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_ATOMIC64_SELFTEST is not set +# CONFIG_SAMPLES is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_TEST_KSTRTOX is not set +# CONFIG_STRICT_DEVMEM is not set +CONFIG_ARM_UNWIND=y +CONFIG_DEBUG_USER=y +# CONFIG_DEBUG_LL is not set + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_DEFAULT_SECURITY="" +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP2=y +# CONFIG_CRYPTO_BUILTIN_TEST is not set +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_USER is not set +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_AUTHENC=y +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=y +# CONFIG_CRYPTO_GCM is not set +CONFIG_CRYPTO_SEQIV=y + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_CTR=y +# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_ECB=y +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_VMAC is not set + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_GHASH is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=y +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +CONFIG_CRYPTO_SHA1=y +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_ANUBIS is not set +CONFIG_CRYPTO_ARC4=y +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_ZLIB is not set +CONFIG_CRYPTO_LZO=y + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +# CONFIG_CRYPTO_USER_API_HASH is not set +# CONFIG_CRYPTO_USER_API_SKCIPHER is not set +# CONFIG_CRYPTO_HW is not set +# CONFIG_BINARY_PRINTF is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_CRC_CCITT=y +CONFIG_CRC16=y +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=y +# CONFIG_CRC8 is not set +CONFIG_AUDIT_GENERIC=y +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +# CONFIG_XZ_DEC is not set +# CONFIG_XZ_DEC_BCJ is not set +CONFIG_REED_SOLOMON=y +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_BCH=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_DQL=y +CONFIG_NLATTR=y +CONFIG_GENERIC_ATOMIC64=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_AVERAGE=y +# CONFIG_CORDIC is not set +# CONFIG_DDR is not set +CONFIG_FBXSERIAL=y diff -Nruw linux-3.6.7-fbx/drivers/fbxgpio./fbxgpio_core.c linux-3.6.7-fbx/drivers/fbxgpio/fbxgpio_core.c --- linux-3.6.7-fbx/drivers/fbxgpio./fbxgpio_core.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxgpio/fbxgpio_core.c 2013-09-03 14:19:32.574091045 +0200 @@ -0,0 +1,312 @@ +#include +#include +#include +#include +#include +#include +#include + +#define PFX "fbxgpio_core: " + +/* #define DEBUG */ +#ifdef DEBUG +#define dprint(Fmt, Arg...) printk(PFX Fmt, Arg) +#else +#define dprint(Fmt, Arg...) do { } while (0) +#endif + +static struct class *fbxgpio_class; + +/* + * show direction in for gpio associated with class_device dev. + */ +static ssize_t show_direction(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxgpio_pin *p; + int dir, ret = 0; + + p = dev_get_drvdata(dev); + + if (p->ops->get_direction) + dir = p->ops->get_direction(p->pin_num); + else + dir = p->direction; + + switch (dir) { + case GPIO_DIR_IN: + ret += sprintf(buf, "input\n"); + break; + case GPIO_DIR_OUT: + ret += sprintf(buf, "output\n"); + break; + default: + ret += sprintf(buf, "unknown\n"); + break; + } + return ret; +} + +/* + * store direction. return -EINVAL if direction string is bad. return + * -EPERM if flag FBXGPIO_PIN_DIR_RW is set in flags. + */ +static ssize_t store_direction(struct device *dev, + struct device_attribute *attr, const char *buf, size_t size) +{ + int dir; + struct fbxgpio_pin *p; + int match_len = 0; + int i; + static const char *word_match[] = { + [GPIO_DIR_IN] = "input", + [GPIO_DIR_OUT] = "output", + }; + + if (*buf == ' ' || *buf == '\t' || *buf == '\r' || *buf == '\n') + /* silently eat any spaces/tab/linefeed/carriagereturn */ + return 1; + + p = dev_get_drvdata(dev); + if (!(p->flags & FBXGPIO_PIN_DIR_RW)) { + dprint("pin %s direction is read only.\n", p->pin_name); + return -EPERM; + } + dir = 0; + for (i = 0; i < 2; ++i) { + if (size >= strlen(word_match[i]) && + !strncmp(buf, word_match[i], strlen(word_match[i]))) { + dir = i; + match_len = strlen(word_match[i]); + break ; + } + } + if (i == 2) + return -EINVAL; + + p->ops->set_direction(p->pin_num, dir); + return match_len; +} + +/* + * show input data for input gpio pins. + */ +static ssize_t show_datain(struct device *dev, + struct device_attribute *attr, char *buf) +{ + int val; + struct fbxgpio_pin *p; + + p = dev_get_drvdata(dev); + if (p->direction == GPIO_DIR_OUT) + return -EINVAL; + val = p->ops->get_datain(p->pin_num); + + if (p->flags & FBXGPIO_PIN_REVERSE_POL) + val = 1 - val; + return sprintf(buf, "%i\n", val); +} + +/* + * show output data for output gpio pins. + */ +static ssize_t show_dataout(struct device *dev, + struct device_attribute *attr, char *buf) +{ + int val; + struct fbxgpio_pin *p; + + p = dev_get_drvdata(dev); + if (p->direction == GPIO_DIR_IN) + return -EINVAL; + if (p->ops->get_dataout) + val = p->ops->get_dataout(p->pin_num); + else + val = p->cur_dataout; + + if (p->flags & FBXGPIO_PIN_REVERSE_POL) + val = 1 - val; + return sprintf(buf, "%i\n", val); +} + +/* + * store new dataout value for output gpio pins. + */ +static ssize_t store_dataout(struct device *dev, + struct device_attribute *attr, const char *buf, size_t size) +{ + int val; + struct fbxgpio_pin *p; + + if (*buf == ' ' || *buf == '\t' || *buf == '\r' || *buf == '\n') + /* silently eat any spaces/tab/linefeed/carriagereturn */ + return 1; + + p = dev_get_drvdata(dev); + + if (p->direction != GPIO_DIR_OUT) + return -EINVAL; + + switch (*buf) { + case '0': + val = 0; + break ; + case '1': + val = 1; + break ; + default: + return -EINVAL; + } + + p->cur_dataout = val; + + if (p->flags & FBXGPIO_PIN_REVERSE_POL) + val = 1 - val; + p->ops->set_dataout(p->pin_num, val); + return 1; +} + +/* + * show pin number associated with gpio pin. + */ +static ssize_t show_pinnum(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxgpio_pin *p; + + p = dev_get_drvdata(dev); + return sprintf(buf, "%i\n", p->pin_num); +} + +/* + * attribute list associated with each class device. + */ +static struct device_attribute gpio_attributes[] = { + __ATTR(direction, 0600, show_direction, store_direction), + __ATTR(data_in, 0400, show_datain, NULL), + __ATTR(data_out, 0600, show_dataout, store_dataout), + __ATTR(pin_num, 0400, show_pinnum, NULL), +}; + +static int fbxgpio_register_pin(struct platform_device *ppdev, + struct fbxgpio_pin *pin) +{ + struct device *dev; + int i, ret; + + dprint("registering pin %s\n", pin->pin_name); + + /* ensure ops is valid */ + if (!pin->ops) { + printk(KERN_ERR PFX "no operation set for pin %s\n", + pin->pin_name); + return -EINVAL; + } + + dev = device_create(fbxgpio_class, &ppdev->dev, 0, pin, + "%s", pin->pin_name); + if (IS_ERR(dev)) + return PTR_ERR(dev); + + for (i = 0; i < ARRAY_SIZE(gpio_attributes); i++) { + ret = device_create_file(dev, &gpio_attributes[i]); + if (ret) + goto err_out; + } + + /* ensure pin direction matches hardware state */ + if (pin->ops->get_direction && + pin->direction != pin->ops->get_direction(pin->pin_num)) { + printk(KERN_WARNING PFX "pin %s default direction does not " + "match current hardware state, fixing.\n", + pin->pin_name); + pin->ops->set_direction(pin->pin_num, pin->direction); + } + pin->dev = dev; + return 0; + +err_out: + for (; i >= 0; i--) + device_remove_file(dev, &gpio_attributes[i]); + device_unregister(dev); + return ret; +} + +static void fbxgpio_unregister_pin(struct fbxgpio_pin *pin) +{ + struct device *dev; + int i; + + dprint("unregistering pin %s\n", pin->pin_name); + dev = pin->dev; + pin->dev = NULL; + + for (i = 0; i < ARRAY_SIZE(gpio_attributes); i++) + device_remove_file(dev, &gpio_attributes[i]); + device_unregister(dev); +} + +static int fbxgpio_platform_probe(struct platform_device *pdev) +{ + struct fbxgpio_pin *p; + int err = 0; + + p = pdev->dev.platform_data; + while (p->pin_name) { + err = fbxgpio_register_pin(pdev, p); + if (err) + return err; + ++p; + } + return 0; +} + +static int fbxgpio_platform_remove(struct platform_device *pdev) +{ + struct fbxgpio_pin *p; + + p = pdev->dev.platform_data; + while (p->pin_name) { + fbxgpio_unregister_pin(p); + ++p; + } + return 0; +} + +static struct platform_driver fbxgpio_platform_driver = +{ + .probe = fbxgpio_platform_probe, + .remove = fbxgpio_platform_remove, + .driver = { + .name = "fbxgpio", + } +}; + +static int __init fbxgpio_init(void) +{ + int ret; + + fbxgpio_class = class_create(THIS_MODULE, "fbxgpio"); + if (IS_ERR(fbxgpio_class)) + return PTR_ERR(fbxgpio_class); + + ret = platform_driver_register(&fbxgpio_platform_driver); + if (ret) { + printk(KERN_ERR PFX "unable to register fbxgpio driver.\n"); + class_destroy(fbxgpio_class); + return ret; + } + return 0; +} + +static void __exit fbxgpio_exit(void) +{ + platform_driver_unregister(&fbxgpio_platform_driver); + class_destroy(fbxgpio_class); +} + +subsys_initcall(fbxgpio_init); +module_exit(fbxgpio_exit); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Nicolas Schichan "); diff -Nruw linux-3.6.7-fbx/drivers/fbxgpio./Kconfig linux-3.6.7-fbx/drivers/fbxgpio/Kconfig --- linux-3.6.7-fbx/drivers/fbxgpio./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxgpio/Kconfig 2013-09-03 14:19:32.574091045 +0200 @@ -0,0 +1,3 @@ +config FREEBOX_GPIO + tristate "Freebox GPIO control interface" + default n diff -Nruw linux-3.6.7-fbx/drivers/fbxgpio./Makefile linux-3.6.7-fbx/drivers/fbxgpio/Makefile --- linux-3.6.7-fbx/drivers/fbxgpio./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxgpio/Makefile 2013-09-03 14:19:32.574091045 +0200 @@ -0,0 +1 @@ +obj-$(CONFIG_FREEBOX_GPIO) += fbxgpio_core.o diff -Nruw linux-3.6.7-fbx/drivers/fbxjtag./Kconfig linux-3.6.7-fbx/drivers/fbxjtag/Kconfig --- linux-3.6.7-fbx/drivers/fbxjtag./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxjtag/Kconfig 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1,3 @@ +config FREEBOX_JTAG + tristate "Freebox JTAG control interface" + default n diff -Nruw linux-3.6.7-fbx/drivers/fbxjtag./Makefile linux-3.6.7-fbx/drivers/fbxjtag/Makefile --- linux-3.6.7-fbx/drivers/fbxjtag./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxjtag/Makefile 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1 @@ +obj-$(CONFIG_FREEBOX_JTAG) += fbxjtag.o diff -Nruw linux-3.6.7-fbx/drivers/fbxmtd./Kconfig linux-3.6.7-fbx/drivers/fbxmtd/Kconfig --- linux-3.6.7-fbx/drivers/fbxmtd./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxmtd/Kconfig 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1,41 @@ +menuconfig FREEBOX_MTD + tristate "Freebox Memory Technology Devices (FBXMTD) support" + +if FREEBOX_MTD + +config FREEBOX_MTD_BACKEND_AMD + bool "Support for AMD compatible flash" + +config FREEBOX_MTD_BACKEND_INTEL + bool "Support for Intel Strataflash" + +config FREEBOX_MTD_BLK + tristate "Block device access to fbxmtd" + depends on BLOCK + +config FREEBOX_MTD_CHAR + tristate "Character device access to fbxmtd" + + +comment "Mapping drivers" + +# +# Generic mapping driver. +# +config FREEBOX_MTD_MAP_DRV_FBX + tristate "Freebox mapping Driver." + select CRC32 + +config FREEBOX_MTD_MAP_DRV_BCM963XX + tristate "Broadcom 963xx flash format" + select CRC32 + +# +# Freebox MTD Map Control interface +# +config FREEBOX_MTD_MAP_IOCTL + tristate "IOCTL control interface" + depends on FREEBOX_MTD_MAP_DRV_FBX + +endif + diff -Nruw linux-3.6.7-fbx/drivers/fbxmtd./Makefile linux-3.6.7-fbx/drivers/fbxmtd/Makefile --- linux-3.6.7-fbx/drivers/fbxmtd./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxmtd/Makefile 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1,24 @@ + +# core support +obj-$(CONFIG_FREEBOX_MTD) += fbxmtd.o + +fbxmtd-objs += fbxmtd_core.o fbxmtd_core_io.o +ifeq ($(CONFIG_FREEBOX_MTD_BACKEND_AMD),y) +fbxmtd-objs += fbxmtd_core_amd.o +endif + +ifeq ($(CONFIG_FREEBOX_MTD_BACKEND_INTEL),y) +fbxmtd-objs += fbxmtd_core_intel.o +endif + +# generic character device access support (r/w with read erase modify write) +obj-$(CONFIG_FREEBOX_MTD_CHAR) += fbxmtd_char.o +fbxmtd_char-objs += fbxmtd_char_dev.o + +# generic r/o block device access support +obj-$(CONFIG_FREEBOX_MTD_BLK) += fbxmtd_blk.o +fbxmtd_blk-objs += fbxmtd_blk_dev.o + +obj-$(CONFIG_FREEBOX_MTD_MAP_DRV_FBX) += fbxmtd_map_drv_fbx.o +obj-$(CONFIG_FREEBOX_MTD_MAP_DRV_BCM963XX) += fbxmtd_map_drv_bcm963xx.o +obj-$(CONFIG_FREEBOX_MTD_MAP_IOCTL) += fbxmtd_map_ioctl.o diff -Nruw linux-3.6.7-fbx/drivers/fbxpanel./Kconfig linux-3.6.7-fbx/drivers/fbxpanel/Kconfig --- linux-3.6.7-fbx/drivers/fbxpanel./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxpanel/Kconfig 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1,13 @@ +menuconfig FREEBOX_PANEL + tristate "Freebox Panel Management" + default n + +if FREEBOX_PANEL + +config FREEBOX_PANEL_HW_PIC_FBX + tristate "I2C PIC-based Panel driver." + default n + select I2C + +endif + diff -Nruw linux-3.6.7-fbx/drivers/fbxpanel./Makefile linux-3.6.7-fbx/drivers/fbxpanel/Makefile --- linux-3.6.7-fbx/drivers/fbxpanel./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxpanel/Makefile 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1,5 @@ +obj-$(CONFIG_FREEBOX_PANEL) += fbxpanel.o + +fbxpanel-objs = fbxpanel_class.o fbxpanel_anim.o + +obj-$(CONFIG_FREEBOX_PANEL_HW_PIC_FBX) += fbxpanel_hw_pic_fbx.o diff -Nruw linux-3.6.7-fbx/drivers/fbxprocfs./fbxprocfs.c linux-3.6.7-fbx/drivers/fbxprocfs/fbxprocfs.c --- linux-3.6.7-fbx/drivers/fbxprocfs./fbxprocfs.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxprocfs/fbxprocfs.c 2014-04-17 16:28:05.592947215 +0200 @@ -0,0 +1,205 @@ +/* + * Freebox ProcFs interface + */ + +#include +#include +#include +#include + +#include + +#define PFX "fbxprocfs: " + + +static struct list_head clients; +static struct mutex clients_mutex; + +static struct proc_dir_entry *root; + +/* + * register a fbxprocfs client with given dirname, caller should + * consider returned struct opaque + */ +struct fbxprocfs_client *fbxprocfs_add_client(const char *dirname, + struct module *owner) +{ + struct fbxprocfs_client *ret, *p; + + ret = NULL; + mutex_lock(&clients_mutex); + + /* check for duplicate */ + list_for_each_entry(p, &clients, list) { + if (!strcmp(dirname, p->dirname)) + goto out; + } + + if (!(ret = kmalloc(sizeof (*ret), GFP_KERNEL))) { + printk(KERN_ERR PFX "kmalloc failed\n"); + goto out; + } + + /* try to create client directory */ + if (!(ret->dir = proc_mkdir(dirname, root))) { + printk(KERN_ERR PFX "can't create %s dir\n", dirname); + kfree(ret); + ret = NULL; + goto out; + } + + atomic_set(&ret->refcount, 1); + ret->dirname = dirname; + list_add(&ret->list, &clients); + +out: + mutex_unlock(&clients_mutex); + return ret; +} + +/* + * unregister a fbxprocfs client, make sure usage count is zero + */ +int fbxprocfs_remove_client(struct fbxprocfs_client *client) +{ + int ret; + + mutex_lock(&clients_mutex); + + ret = 0; + if (atomic_read(&client->refcount) > 1) { + ret = -EBUSY; + goto out; + } + + remove_proc_entry(client->dirname, root); + list_del(&client->list); + kfree(client); + +out: + mutex_unlock(&clients_mutex); + return ret; +} + +/* + * remove given entries from client directory + */ +static int +__remove_entries(struct fbxprocfs_client *client, + const struct fbxprocfs_ro_desc *ro_desc, + const struct fbxprocfs_rw_desc *rw_desc) +{ + int i; + + for (i = 0; ro_desc && ro_desc[i].name; i++) { + remove_proc_entry(ro_desc[i].name, client->dir); + atomic_dec(&client->refcount); + } + + for (i = 0; rw_desc && rw_desc[i].name; i++) { + remove_proc_entry(rw_desc[i].name, client->dir); + atomic_dec(&client->refcount); + } + + return 0; +} + +/* + * create given entries in client directory + */ +static int +__create_entries(struct fbxprocfs_client *client, + const struct fbxprocfs_ro_desc *ro_desc, + const struct fbxprocfs_rw_desc *rw_desc) +{ + struct proc_dir_entry *proc; + int i; + + for (i = 0; ro_desc && ro_desc[i].name; i++) { + if (!(proc = create_proc_read_entry(ro_desc[i].name, 0, + client->dir, + ro_desc[i].rfunc, + (void *) ro_desc[i].id))) { + printk(KERN_ERR PFX "can't create %s/%s entry\n", + client->dirname, ro_desc[i].name); + goto err; + } + atomic_inc(&client->refcount); + } + + for (i = 0; rw_desc && rw_desc[i].name; i++) { + if (!(proc = create_proc_entry(rw_desc[i].name, 0, + client->dir))) { + printk(KERN_ERR PFX "can't create %s/%s entry\n", + client->dirname, ro_desc[i].name); + goto err; + } + + proc->read_proc = rw_desc[i].rfunc; + proc->write_proc = rw_desc[i].wfunc; + proc->data = (void *)rw_desc[i].id; + atomic_inc(&client->refcount); + } + + return 0; + +err: + __remove_entries(client, ro_desc, rw_desc); + return -1; +} + +int +fbxprocfs_create_entries(struct fbxprocfs_client *client, + const struct fbxprocfs_ro_desc *ro_desc, + const struct fbxprocfs_rw_desc *rw_desc) +{ + int ret; + + ret = __create_entries(client, ro_desc, rw_desc); + return ret; +} + +int +fbxprocfs_remove_entries(struct fbxprocfs_client *client, + const struct fbxprocfs_ro_desc *ro_desc, + const struct fbxprocfs_rw_desc *rw_desc) +{ + int ret; + + ret = __remove_entries(client, ro_desc, rw_desc); + return ret; +} + + +static int __init +fbxprocfs_init(void) +{ + INIT_LIST_HEAD(&clients); + mutex_init(&clients_mutex); + + /* create freebox directory */ + if (!(root = proc_mkdir("freebox", NULL))) { + printk(KERN_ERR PFX "can't create freebox/ dir\n"); + return -EIO; + } + return 0; +} + +static void __exit +fbxprocfs_exit(void) +{ + remove_proc_entry("freebox", NULL); +} + +module_init(fbxprocfs_init); +module_exit(fbxprocfs_exit); + +EXPORT_SYMBOL(fbxprocfs_create_entries); +EXPORT_SYMBOL(fbxprocfs_remove_entries); +EXPORT_SYMBOL(fbxprocfs_add_client); +EXPORT_SYMBOL(fbxprocfs_remove_client); + +MODULE_LICENSE("GPL"); +MODULE_VERSION("1.0"); +MODULE_AUTHOR("Maxime Bizon "); + diff -Nruw linux-3.6.7-fbx/drivers/fbxprocfs./Kconfig linux-3.6.7-fbx/drivers/fbxprocfs/Kconfig --- linux-3.6.7-fbx/drivers/fbxprocfs./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxprocfs/Kconfig 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1,2 @@ +config FREEBOX_PROCFS + tristate "Freebox procfs interface" diff -Nruw linux-3.6.7-fbx/drivers/fbxprocfs./Makefile linux-3.6.7-fbx/drivers/fbxprocfs/Makefile --- linux-3.6.7-fbx/drivers/fbxprocfs./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxprocfs/Makefile 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1 @@ +obj-$(CONFIG_FREEBOX_PROCFS) += fbxprocfs.o diff -Nruw linux-3.6.7-fbx/drivers/fbxwatchdog./fbxwatchdog_char.c linux-3.6.7-fbx/drivers/fbxwatchdog/fbxwatchdog_char.c --- linux-3.6.7-fbx/drivers/fbxwatchdog./fbxwatchdog_char.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxwatchdog/fbxwatchdog_char.c 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1,218 @@ +/* + * add standard char device interface for fbxwatchdog. + */ + +/* + * XXX: results are undefined if attemps are made to access watchdog + * from char device interface and sysfs at the same time. + */ + +#define PFX "fbxwatchdog_char: " + +#include +#include +#include +#include +#include +#include +#include "fbxwatchdog.h" + +#include + +static struct fbxwatchdog *chardev_wdt; +static unsigned long chardev_users; +static unsigned long default_countdown = 60 * 1000; +static int expect_close; + +/* + * we support the WDIOF_MAGICCLOSE: is the user writes 'V' to the device, + * the release method will stop the watchdog. + */ +static int +wdt_write(struct file *file, const char *__user buf, size_t len, loff_t *ppos) +{ + int i; + + if (!len) + return 0; + + for (i = 0; i < len; ++i) { + char c; + + if (get_user(c, buf + i)) + return -EFAULT; + if (c == 'V') + expect_close = 1; + } + if (len) + chardev_wdt->countdown = default_countdown; + return len; +} + +static long +wdt_ioctl(struct file *file, + unsigned int cmd, unsigned long arg) +{ + static const struct watchdog_info winfo = { + .options = WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE | + WDIOF_KEEPALIVEPING, + .firmware_version = 0x42, + .identity = "fbxwatchdog", + }; + int tmp; + + switch (cmd) { + case WDIOC_GETSUPPORT: + /* + * return watchdog information structure to userland. + */ + return copy_to_user((struct watchdog_info __user *)arg, + &winfo, sizeof (winfo)) ? -EFAULT: 0; + + case WDIOC_SETTIMEOUT: + /* + * set watchdog timeout: if current countdown is + * higher than timeout, set countdown to timeout + * value. + */ + if (copy_from_user(&tmp, (void __user *) arg, + sizeof (tmp))) { + return -EFAULT; + } + if (1000 * tmp < 0) + return -EINVAL; + default_countdown = 1000 * tmp; + if (chardev_wdt->countdown > default_countdown) + chardev_wdt->countdown = default_countdown; + return 0; + + case WDIOC_GETTIMEOUT: + /* + * get current timeout value. + */ + tmp = default_countdown / 1000; + return copy_to_user((void __user *)arg, &tmp, + sizeof (tmp)) ? -EFAULT : 0; + + case WDIOC_KEEPALIVE: + /* + * ping watchdog. + */ + chardev_wdt->countdown = default_countdown; + return 0; + + case WDIOC_GETTIMELEFT: + /* + * return current countdown value to userland. + */ + tmp = chardev_wdt->countdown / 1000; + return copy_to_user((void __user *)arg, &tmp, sizeof (tmp)) ? + -EFAULT : 0; + + default: + return -ENOIOCTLCMD; + } +} + +/* + * called when remote process calls close(2) on watchdog fd or + * exit(2). + */ +static int +wdt_release(struct inode *inode, struct file *file) +{ + unsigned long flags; + + if (expect_close && chardev_wdt->enabled) { + spin_lock_irqsave(&chardev_wdt->lock, flags); + chardev_wdt->enabled = 0; + chardev_wdt->wdt_stop(chardev_wdt); + spin_unlock_irqrestore(&chardev_wdt->lock, flags); + } else + printk(KERN_CRIT PFX "unexpected close: not stopping " + "watchdog.\n"); + chardev_users = 0; + return 0; +} + +/* + * open watchdog device file: the test_and_set_bit enforces the fact + * that only one process opens the watchdog device file as long as it + * does not try to fork(2). dup(2)/dup2(2) might be problematic + * too. thus, we assume that watchdogd will do "The right thing" and + * won't try to do anything too fancy with the fd opened to + * /dev/watchdog. + */ +static int wdt_open(struct inode *inode, struct file *file) +{ + unsigned long flags; + + if (test_and_set_bit(1, &chardev_users)) + return -EBUSY; + + expect_close = 0; + + /* + * watchdog is to be enabled when opened. + */ + if (!chardev_wdt->enabled) { + spin_lock_irqsave(&chardev_wdt->lock, flags); + chardev_wdt->enabled = 1; + chardev_wdt->countdown = default_countdown; + chardev_wdt->wdt_start(chardev_wdt); + chardev_wdt->countdown_min = INT_MAX; + spin_unlock_irqrestore(&chardev_wdt->lock, flags); + } + return 0; +} + +static struct file_operations wdt_fops = { + .owner = THIS_MODULE, + .open = wdt_open, + .write = wdt_write, + .unlocked_ioctl = wdt_ioctl, + .release = wdt_release, +}; + +static struct miscdevice wdt_miscdev = { + .minor = WATCHDOG_MINOR, + .name = "watchdog", + .fops = &wdt_fops, +}; + +/* + * add watchdog to the char interface. if we are already bound to a + * watchdog, return 0, this is not a major no-no. + */ +int +fbxwatchdog_char_add(struct fbxwatchdog *wdt) +{ + int err; + + err = misc_register(&wdt_miscdev); + if (err) { + printk("unable to register misc device.\n"); + if (err == -EEXIST) + return 0; + return err; + } + chardev_wdt = wdt; + return 0; +} + +/* + * if the watchdog is bound to the char device interface, unregister + * the misc device and tell that we are no more bound to a + * watchdog. otherwise, do nothing. + */ +void +fbxwatchdog_char_remove(struct fbxwatchdog *wdt) +{ + if (wdt != chardev_wdt) + return ; + misc_deregister(&wdt_miscdev); + chardev_wdt = NULL; +} + +EXPORT_SYMBOL(fbxwatchdog_char_add); +EXPORT_SYMBOL(fbxwatchdog_char_remove); diff -Nruw linux-3.6.7-fbx/drivers/fbxwatchdog./fbxwatchdog_core.c linux-3.6.7-fbx/drivers/fbxwatchdog/fbxwatchdog_core.c --- linux-3.6.7-fbx/drivers/fbxwatchdog./fbxwatchdog_core.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxwatchdog/fbxwatchdog_core.c 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1,301 @@ +#include +#include +#include +#include +#include +#include +#include +#include + +#include "fbxwatchdog.h" + +#define SOFTTIMER_FREQ (HZ / 10) + +#define PFX "fbxwatchdog: " + +static struct class *fbxwatchdog_class; + +static ssize_t +show_enabled(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxwatchdog *wdt; + + wdt = dev_get_drvdata(dev); + if (!wdt) { + printk(KERN_DEBUG "ignoring request to dead watchdog.\n"); + return -ENODEV; + } + + return snprintf(buf, PAGE_SIZE, "%i\n", wdt->enabled); +} + +/* + * start/stop watchdog depending on the value of the first character + * of buf. set countdown_min to a sane value. + */ +static ssize_t +store_enabled(struct device *dev, + struct device_attribute *attr, const char *buf, size_t size) +{ + struct fbxwatchdog *wdt; + unsigned long flags; + + wdt = dev_get_drvdata(dev); + if (!wdt) { + printk(KERN_DEBUG "ignoring request to dead watchdog.\n"); + return -ENODEV; + } + + if (size == 0) + return 0; + + + spin_lock_irqsave(&wdt->lock, flags); + switch (*buf) { + case '0': + if (wdt->enabled) { + wdt->enabled = 0; + wdt->wdt_stop(wdt); + } + break; + + case '1': + if (!wdt->enabled) { + wdt->enabled = 1; + wdt->wdt_start(wdt); + wdt->countdown_min = INT_MAX; + } + break; + + default: + break; + } + spin_unlock_irqrestore(&wdt->lock, flags); + + return size; +} + +static ssize_t +show_countdown(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxwatchdog *wdt; + + wdt = dev_get_drvdata(dev); + if (!wdt) { + printk(KERN_DEBUG "ignoring request to dead watchdog.\n"); + return -ENODEV; + } + + return snprintf(buf, PAGE_SIZE, "%i\n", wdt->countdown); +} + +/* + * update watchdog countdown with the userland value given in buf. + */ +static ssize_t +store_countdown(struct device *dev, + struct device_attribute *attr, const char *buf, size_t size) +{ + struct fbxwatchdog *wdt; + int countdown; + char *ptr; + + wdt = dev_get_drvdata(dev); + if (!wdt) { + printk(KERN_DEBUG "ignoring request to dead watchdog.\n"); + return -ENODEV; + } + + if (size == 0) + return 0; + + ptr = kzalloc(size + 1, GFP_KERNEL); + if (!ptr) + return -ENOMEM; + strlcpy(ptr, buf, size + 1); + + countdown = simple_strtoul(ptr, NULL, 10); + wdt->countdown = countdown; + kfree(ptr); + + return size; +} + +static ssize_t +show_countdown_min(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxwatchdog *wdt; + + wdt = dev_get_drvdata(dev); + if (!wdt) { + printk(KERN_DEBUG "ignoring request to dead watchdog.\n"); + return -ENODEV; + } + + return snprintf(buf, PAGE_SIZE, "%i\n", wdt->countdown_min); +} + +static struct device_attribute wdt_attributes[] = { + __ATTR(enabled, 0600, show_enabled, store_enabled), + __ATTR(countdown, 0600, show_countdown, store_countdown), + __ATTR(countdown_min, 0400, show_countdown_min, NULL), +}; + +/* + * software timer callback: decrement countdown and update + * countdown_min if needed. this is called 10 times per second. + */ +static void fbxwatchdog_timer_cb(unsigned long data) +{ + struct fbxwatchdog *wdt; + + wdt = (struct fbxwatchdog *)data; + + if (wdt->enabled) { + wdt->countdown -= jiffies_to_msecs(SOFTTIMER_FREQ); + if (wdt->countdown < wdt->countdown_min) + wdt->countdown_min = wdt->countdown; + } + + wdt->timer.expires = jiffies + SOFTTIMER_FREQ; + add_timer(&wdt->timer); +} + +/* + * called from half life interrupt handler, panic if countdown is too + * low (ie if userland has not reset countdown to before it reached + * 0). + */ +static void fbxwatchdog_halflife_cb(struct fbxwatchdog *wdt) +{ + if (wdt->countdown <= 0) { + wdt->wdt_stop(wdt); + panic("software fbxwatchdog triggered"); + } +} + +/* + * register a new watchdog device. + */ +int fbxwatchdog_register(struct fbxwatchdog *wdt) +{ + struct device *dev; + int i = 0, err = 0; + + if (wdt == NULL) + return -EFAULT; + + printk(KERN_INFO PFX "registering watchdog %s\n", wdt->name); + + dev = device_create(fbxwatchdog_class, NULL, 0, wdt, "%s", wdt->name); + if (IS_ERR(dev)) { + printk(KERN_ERR PFX "unable to allocate device.\n"); + err = PTR_ERR(dev); + goto out_error; + } + wdt->dev = dev; + + for (i = 0; i < ARRAY_SIZE(wdt_attributes); i++) { + err = device_create_file(dev, &wdt_attributes[i]); + if (err) + goto out_error; + } + + /* start countdown soft timer */ + init_timer(&wdt->timer); + wdt->timer.function = fbxwatchdog_timer_cb; + wdt->timer.data = (unsigned long)wdt; + wdt->timer.expires = jiffies + SOFTTIMER_FREQ; + add_timer(&wdt->timer); + + spin_lock_init(&wdt->lock); + + wdt->cb = fbxwatchdog_halflife_cb; + err = wdt->wdt_init(wdt); + if (err) { + printk(KERN_ERR PFX "unable to do low level init of " + "watchdog %s.\n", wdt->name); + goto out_del_timer; + } + +#ifdef CONFIG_FREEBOX_WATCHDOG_CHAR + err = fbxwatchdog_char_add(wdt); + if (err) { + printk(KERN_ERR PFX "unable to add %s to the fbxwatchdog char " + "device interface.\n", wdt->name); + goto out_wdt_cleanup; + } +#endif + + return 0; + +#ifdef CONFIG_FREEBOX_WATCHDOG_CHAR +out_wdt_cleanup: + wdt->wdt_cleanup(wdt); +#endif + +out_del_timer: + del_timer_sync(&wdt->timer); +out_error: + if (wdt->dev) { + for (; i >= 0; i--) + device_remove_file(dev, &wdt_attributes[i]); + device_unregister(dev); + } + return err; +} + +int fbxwatchdog_unregister(struct fbxwatchdog *wdt) +{ + int i; + + printk(KERN_INFO PFX "registering watchdog %s\n", wdt->name); + + if (wdt->enabled) { + unsigned long flags; + + printk(KERN_WARNING "removing enabled watchdog.\n"); + spin_lock_irqsave(&wdt->lock, flags); + wdt->wdt_stop(wdt); + spin_unlock_irqrestore(&wdt->lock, flags); + } + +#ifdef CONFIG_FREEBOX_WATCHDOG_CHAR + fbxwatchdog_char_remove(wdt); +#endif + wdt->wdt_cleanup(wdt); + del_timer_sync(&wdt->timer); + for (i = 0; i < ARRAY_SIZE(wdt_attributes); i++) + device_remove_file(wdt->dev, &wdt_attributes[i]); + device_unregister(wdt->dev); + wdt->dev = NULL; + return 0; +} + +static int __init fbxwatchdog_init(void) +{ + printk(KERN_INFO PFX "2007, Freebox SA.\n"); + fbxwatchdog_class = class_create(THIS_MODULE, "fbxwatchdog"); + if (IS_ERR(fbxwatchdog_class)) + return PTR_ERR(fbxwatchdog_class); + return 0; +} + +static void __exit fbxwatchdog_exit(void) +{ + class_destroy(fbxwatchdog_class); +} + + +EXPORT_SYMBOL_GPL(fbxwatchdog_register); +EXPORT_SYMBOL_GPL(fbxwatchdog_unregister); + +module_init(fbxwatchdog_init); +module_exit(fbxwatchdog_exit); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Nicolas Schichan "); +MODULE_DESCRIPTION("Freebox Watchdog Core - www.freebox.fr"); diff -Nruw linux-3.6.7-fbx/drivers/fbxwatchdog./fbxwatchdog.h linux-3.6.7-fbx/drivers/fbxwatchdog/fbxwatchdog.h --- linux-3.6.7-fbx/drivers/fbxwatchdog./fbxwatchdog.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxwatchdog/fbxwatchdog.h 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1,47 @@ +#ifndef FBXWATCHDOG_H +# define FBXWATCHDOG_H + +struct fbxwatchdog { + const char *name; + void *priv; + + int enabled; + int countdown; + int countdown_min; + + int (*wdt_init)(struct fbxwatchdog *wdt); + int (*wdt_cleanup)(struct fbxwatchdog *wdt); + + /* + * wdt_start and wdt_stop are called with wdt->lock held and irq + * disabled. + */ + int (*wdt_start)(struct fbxwatchdog *wdt); + int (*wdt_stop)(struct fbxwatchdog *wdt); + + /* + * cb is called from interrupt/softirq context (depends on the + * underlying driver/hardware). + */ + void (*cb)(struct fbxwatchdog *wdt); + + struct timer_list timer; + + struct device *dev; + + /* + * protect interrupt handlers & start/stop methods running in + * thead context. + */ + spinlock_t lock; +}; + +int fbxwatchdog_register(struct fbxwatchdog *wdt); +int fbxwatchdog_unregister(struct fbxwatchdog *wdt); + +#ifdef CONFIG_FREEBOX_WATCHDOG_CHAR +int fbxwatchdog_char_add(struct fbxwatchdog *wdt); +void fbxwatchdog_char_remove(struct fbxwatchdog *wdt); +#endif + +#endif /* !FBXWATCHDOG_H */ diff -Nruw linux-3.6.7-fbx/drivers/fbxwatchdog./fbxwatchdog_orion.c linux-3.6.7-fbx/drivers/fbxwatchdog/fbxwatchdog_orion.c --- linux-3.6.7-fbx/drivers/fbxwatchdog./fbxwatchdog_orion.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxwatchdog/fbxwatchdog_orion.c 2014-04-17 16:28:05.592947215 +0200 @@ -0,0 +1,251 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "fbxwatchdog.h" + +#define PFX "fbxwatchdog_orion: " + +struct fbxwatchdog_orion_priv { + struct clk *clk; + unsigned int tclk; + void __iomem *base; + struct timer_list half_life_timer; +}; + +/* + * Watchdog timer block registers. + */ +#define TIMER_CTRL (TIMER_VIRT_BASE + 0x0000) +#define WDT_EN 0x0010 +#define WDT_VAL (TIMER_VIRT_BASE + 0x0024) + +#define WDT_MAX_CYCLE_COUNT 0xffffffff +#define WDT_IN_USE 0 +#define WDT_OK_TO_CLOSE 1 + +/* + * orion does not trigger interrupts each times the watchdog reaches + * the half of it's count down. we emulate this behaviour using a + * linux timer that fires every 500 msec. + */ +static void +half_life_timer_cb(unsigned long data) +{ + struct fbxwatchdog *wdt; + struct fbxwatchdog_orion_priv *priv; + unsigned long flags; + + wdt = (struct fbxwatchdog *)data; + priv = wdt->priv; + + spin_lock_irqsave(&wdt->lock, flags); + + /* reload counter */ + writel(priv->tclk, WDT_VAL); + + if (wdt->cb) + wdt->cb(wdt); + + priv->half_life_timer.expires = jiffies + HZ / 2; + add_timer(&priv->half_life_timer); + + spin_unlock_irqrestore(&wdt->lock, flags); +} + +/* + * setup half life timer. + */ +static int orion_wdt_init(struct fbxwatchdog *wdt) +{ + struct fbxwatchdog_orion_priv *priv; + + priv = wdt->priv; + init_timer(&priv->half_life_timer); + priv->half_life_timer.function = half_life_timer_cb; + priv->half_life_timer.data = (unsigned long)wdt; + return 0; +} + +static int orion_wdt_cleanup(struct fbxwatchdog *wdt) +{ + return 0; +} + +static int orion_wdt_start(struct fbxwatchdog *wdt) +{ + struct fbxwatchdog_orion_priv *priv; + uint32_t val; + + printk(KERN_INFO PFX "starting watchdog ...\n"); + + priv = wdt->priv; + val = readl(TIMER_CTRL); + if (val & WDT_EN) { + printk(KERN_WARNING PFX "watchdog has been enabled by " + "bootloader.!\n"); + /* disable it */ + val &= ~WDT_EN; + writel(val, TIMER_CTRL); + } + + /* watchdog will blow up after 1 second if not refreshed */ + writel(priv->tclk, WDT_VAL); + + /* enable it */ + val = readl(TIMER_CTRL); + val |= WDT_EN; + writel(val, TIMER_CTRL); + + /* enable reset on watchdog */ + val = readl(RSTOUTn_MASK); + val |= WDT_RESET_OUT_EN; + writel(val, RSTOUTn_MASK); + + /* will fire every 500 ms */ + priv->half_life_timer.expires = jiffies + HZ / 2; + add_timer(&priv->half_life_timer); + + return 0; +} + +int orion_wdt_stop(struct fbxwatchdog *wdt) +{ + struct fbxwatchdog_orion_priv *priv; + uint32_t val; + + printk(KERN_INFO PFX "stopping watchdog ...\n"); + + priv = wdt->priv; + del_timer_sync(&priv->half_life_timer); + + /* disable it */ + val = readl(TIMER_CTRL); + val &= ~WDT_EN; + writel(val, TIMER_CTRL); + + /* enable reset on watchdog */ + val = readl(RSTOUTn_MASK); + val |= WDT_RESET_OUT_EN; + writel(val, RSTOUTn_MASK); + + return 0; +} + +static int fbxwatchdog_platform_probe(struct platform_device *pdev) +{ + struct fbxwatchdog_orion_priv *priv = NULL; + struct fbxwatchdog *wdt; + struct clk *clk; + int err = 0; + + clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(clk)) { + dev_err(&pdev->dev, "Orion Watchdog missing clock\n"); + return -ENODEV; + } + clk_prepare_enable(clk); + + wdt = kzalloc(sizeof (*wdt), GFP_KERNEL); + if (!wdt) { + printk(KERN_ERR PFX "unable allocate memory for watchdog.\n"); + err = -ENOMEM; + goto out_error; + } + + priv = kzalloc(sizeof (*priv), GFP_KERNEL); + if (!priv) { + printk(KERN_ERR PFX "unable to allocate memory for private " + "structure.\n"); + err = -ENOMEM; + goto out_error; + } + + wdt->priv = priv; + wdt->name = pdev->name; + + wdt->wdt_init = orion_wdt_init; + wdt->wdt_cleanup = orion_wdt_cleanup; + wdt->wdt_start = orion_wdt_start; + wdt->wdt_stop = orion_wdt_stop; + + priv->tclk = clk_get_rate(clk); + priv->clk = clk; + + err = fbxwatchdog_register(wdt); + if (err) { + printk(KERN_ERR PFX "unable to register watchdog %s\n", + wdt->name); + goto out_error; + } + + platform_set_drvdata(pdev, wdt); + + return 0; + + out_error: + if (wdt) + kfree(wdt); + if (priv) + kfree(priv); + clk_disable_unprepare(clk); + return err; +} + +/* + * unregister and free memory allocated by the probe function. + */ +static int +fbxwatchdog_platform_remove(struct platform_device *pdev) +{ + struct fbxwatchdog *wdt; + struct fbxwatchdog_orion_priv *priv; + + wdt = platform_get_drvdata(pdev); + if (!wdt) { + BUG(); + return -ENODEV; + } + + fbxwatchdog_unregister(wdt); + + priv = wdt->priv; + clk_disable_unprepare(priv->clk); + kfree(priv); + kfree(wdt); + + return 0; +} + +struct platform_driver fbxwatchdog_platform_driver = { + .probe = fbxwatchdog_platform_probe, + .remove = fbxwatchdog_platform_remove, + .driver = { + .name = "orion_fbxwdt", + } +}; + +static int __init fbxwatchdog_orion_init(void) +{ + platform_driver_register(&fbxwatchdog_platform_driver); + return 0; +} + +static void __exit fbxwatchdog_orion_exit(void) +{ + platform_driver_unregister(&fbxwatchdog_platform_driver); +} + +module_init(fbxwatchdog_orion_init); +module_exit(fbxwatchdog_orion_exit); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Nicolas Schichan "); +MODULE_DESCRIPTION("Freebox Watchdog, orion specific bits"); + diff -Nruw linux-3.6.7-fbx/drivers/fbxwatchdog./Kconfig linux-3.6.7-fbx/drivers/fbxwatchdog/Kconfig --- linux-3.6.7-fbx/drivers/fbxwatchdog./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxwatchdog/Kconfig 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1,20 @@ +menuconfig FREEBOX_WATCHDOG + tristate "Freebox Watchdog" + default n + +if FREEBOX_WATCHDOG + +config FREEBOX_WATCHDOG_CHAR + bool "Freebox Watchdog char device interface." + default n + +config FREEBOX_WATCHDOG_ORION + tristate "Marvell Orion support" + depends on PLAT_ORION + +config FREEBOX_WATCHDOG_BCM63XX + tristate "Broadcom 63xx Freebox Watchdog support" + depends on BCM63XX + default n + +endif diff -Nruw linux-3.6.7-fbx/drivers/fbxwatchdog./Makefile linux-3.6.7-fbx/drivers/fbxwatchdog/Makefile --- linux-3.6.7-fbx/drivers/fbxwatchdog./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/fbxwatchdog/Makefile 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1,9 @@ +obj-$(CONFIG_FREEBOX_WATCHDOG) += fbxwatchdog.o + +fbxwatchdog-objs = fbxwatchdog_core.o +ifeq ($(CONFIG_FREEBOX_WATCHDOG_CHAR),y) +fbxwatchdog-objs += fbxwatchdog_char.o +endif + +obj-$(CONFIG_FREEBOX_WATCHDOG_ORION) += fbxwatchdog_orion.o +obj-$(CONFIG_FREEBOX_WATCHDOG_BCM63XX) += fbxwatchdog_bcm63xx.o --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/drivers/hwmon/kirkwood-coretemp.c 2013-09-03 14:19:32.578091122 +0200 @@ -0,0 +1,168 @@ +/* + * kirkwood-coretemp.c for kirkwood-coretemp + * Created by on Wed Jul 11 19:59:27 2012 + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define PFX "kirkwood-coretemp: " + +struct kirkwood_coretemp_priv { + void __iomem *reg; + struct device *hwmon_dev; + struct attribute_group attrs; +}; + +static int show_kirkwood_coretemp(struct device *dev, + struct device_attribute *devattr, + char *buf) +{ + struct platform_device *pdev = to_platform_device(dev); + struct kirkwood_coretemp_priv *priv = platform_get_drvdata(pdev); + u32 reg; + u32 raw_temp; + s32 temp_out; + + reg = readl(priv->reg); + + /* + * TermTValid shall be set. + */ + if ((reg & (1 << 9)) == 0) + return -EIO; + + raw_temp = (reg >> 10) & 0x1ff; + + /* + * out temperature = (322 - raw) / 1.3625 + * + * can't use float here, so be creative. + * + * we also have to avoid 32bit integer overflow (hence the + * 1000000 / 1363 division instead of 10000000 / 13625) + */ + temp_out = (322 - raw_temp); + temp_out = (temp_out * 1000000) / 1363; + + return sprintf(buf, "%i\n", temp_out); +} + +static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_kirkwood_coretemp, + NULL, 0); + +static int show_name(struct device *dev, struct device_attribute *devattr, + char *buf) +{ + return sprintf(buf, "%s\n", kobject_name(&dev->kobj)); +} + +static DEVICE_ATTR(name, S_IRUGO, show_name, NULL); + +static struct attribute *kirkwood_coretemp_attr[] = { + &sensor_dev_attr_temp1_input.dev_attr.attr, + &dev_attr_name.attr, + NULL, +}; + +static int kirkwood_coretemp_probe(struct platform_device *pdev) +{ + struct kirkwood_coretemp_priv *priv; + struct resource *resource; + int err = 0; + + dev_dbg(&pdev->dev, "probe.\n"); + + resource = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!resource) + return -ENXIO; + + priv = kzalloc(sizeof (*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->reg = ioremap(resource->start, resource_size(resource)); + if (!priv->reg) { + dev_err(&pdev->dev, "unable to ioremap registers.\n"); + err = -ENOMEM; + goto err_free_priv; + } + + priv->attrs.attrs = kirkwood_coretemp_attr; + err = sysfs_create_group(&pdev->dev.kobj, &priv->attrs); + if (err) { + dev_err(&pdev->dev, "unable to greate sysfs group.\n"); + goto err_iounmap; + } + + platform_set_drvdata(pdev, priv); + + priv->hwmon_dev = hwmon_device_register(&pdev->dev); + if (IS_ERR(priv->hwmon_dev)) { + dev_err(&pdev->dev, "unable to register hwmon device.\n"); + err = PTR_ERR(priv->hwmon_dev); + goto err_sysfs_remove_group; + } + + + return 0; + +err_sysfs_remove_group: + sysfs_remove_group(&pdev->dev.kobj, &priv->attrs); +err_iounmap: + iounmap(priv->reg); +err_free_priv: + kfree(priv); + return err; +} + +static int kirkwood_coretemp_remove(struct platform_device *pdev) +{ + struct kirkwood_coretemp_priv *priv = platform_get_drvdata(pdev); + + dev_dbg(&pdev->dev, "remove.\n"); + hwmon_device_unregister(priv->hwmon_dev); + sysfs_remove_group(&pdev->dev.kobj, &priv->attrs); + iounmap(priv->reg); + kfree(priv); + + return 0; +} + +static struct platform_driver kirkwood_coretemp_driver = { + .probe = kirkwood_coretemp_probe, + .remove = kirkwood_coretemp_remove, + .driver = { + .name = "kirkwood-coretemp", + } +}; + +static int __init kirkwood_coretemp_init(void) +{ + int err; + + err = platform_driver_register(&kirkwood_coretemp_driver); + if (err) { + printk(KERN_ERR PFX "unable to register platform driver.\n"); + return err; + } + + return 0; +} + +static void __exit kirkwood_coretemp_exit(void) +{ + platform_driver_unregister(&kirkwood_coretemp_driver); +} + +module_init(kirkwood_coretemp_init); +module_exit(kirkwood_coretemp_exit); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Nicolas Schichan "); --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/drivers/input/misc/smsc_cap1066.c 2013-09-03 14:19:32.582091198 +0200 @@ -0,0 +1,1075 @@ +#include +#include +#include +#include +#include +#include +#include +#include + +#define PFX "cap1066: " + +/* + * list of registers + */ +#define SMSC_REG_MAIN_CTRL 0x00 +#define SMSC_REG_BTN_STATUS1 0x03 +#define SMSC_REG_DATA_SENSITIVITY 0x1f +#define SMSC_REG_CFG 0x20 +#define SMSC_REG_SENS_CFG 0x22 +#define SMSC_REG_MTOUCH_CFG_REG 0x2a +#define SMSC_REG_CFG2 0x44 +#define SMSC_REG_LED_OUT_TYPE 0x71 +#define SMSC_REG_LED_LINK 0x72 +#define SMSC_REG_LED_OUTPUT_CTL 0x74 +#define SMSC_REG_LED_BEHAVIOUR1 0x81 +#define SMSC_REG_LED_BEHAVIOUR2 0x82 +#define SMSC_REG_LED_DIRECT_DCYCLE 0x93 +#define SMSC_REG_LED_DIRECT_RAMP_RATE 0x94 +#define SMSC_REG_LED_OFF_DELAY 0x95 +#define SMSC_REG_DID 0xfd +#define SMSC_REG_VID 0xfe + +/* + * used in cap1066_init_hw and during priv initialization. + */ +#define DEFAULT_DUTY_CYCLE_MIN 0x4 +#define DEFAULT_DUTY_CYCLE_MAX 0xf +#define DEFAULT_RAMP_TIME_FALL 0x1 +#define DEFAULT_RAMP_TIME_RISE 0x2 + +/* + * vendor id / device id + */ +#define SMSC_CAP1066_VID 0x5d +#define SMSC_CAP1066_DID 0x41 +#define SMSC_CAP1166_DID 0x51 + +static const unsigned short normal_i2c[] = { 0x28, I2C_CLIENT_END }; + +static const struct i2c_device_id cap1066_id[] = { + { "cap1066", 0 }, + { } +}; + +/* + * private context + */ +static unsigned short default_map[CAP1066_MAX_BTNS] = { + BTN_0, + BTN_1, + BTN_2, + BTN_3, + BTN_4, + BTN_5, +}; + +struct led_btn_name +{ + int code; + const char *name; +}; + +/* + * whenever possible symlinks will be created from led_btn_X to + * led_key_y, depending on user provided keymap. add entries here as + * you see fit. + */ +static const struct led_btn_name led_btn_names[] = { + { KEY_UP, "led_key_up", }, + { KEY_DOWN, "led_key_down", }, + { KEY_LEFT, "led_key_left", }, + { KEY_RIGHT, "led_key_right", }, + { KEY_ENTER, "led_key_enter", }, +}; + +enum { + E_SMSC_CAP1066_LED_MODE_AUTO, + E_SMSC_CAP1066_LED_MODE_ON, + E_SMSC_CAP1066_LED_MODE_OFF, +}; + +struct cap1066_led_dev +{ + struct cap1066_priv *parent_priv; + struct device dev; + int led_mode; + int led_index; + const char *btn_link; +}; + +struct cap1066_priv { + struct input_polled_dev *poll_dev; + struct i2c_client *client; + unsigned short keymap[CAP1066_MAX_BTNS]; + struct cap1066_led_dev *led_devices[CAP1066_MAX_BTNS]; + + u8 duty_cycle_min; + u8 duty_cycle_max; + u8 raw_ramp_time_fall; + u8 raw_ramp_time_rise; + + bool has_irq_gpio; + unsigned int irq_gpio; +}; + +static const char *get_keycode_btn_name(int key_code) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(led_btn_names); ++i) { + if (key_code == led_btn_names[i].code) + return led_btn_names[i].name; + } + return NULL; +} + +/* + * single register read + */ +static int cap1066_read_reg(struct i2c_client *client, u8 reg, u8 *val) +{ + int ret; + + ret = i2c_smbus_read_byte_data(client, reg); + if (ret < 0) { + printk(KERN_ERR PFX "read failed: %d\n", ret); + return ret; + } + + *val = (u8)ret; + return 0; +} + +/* + * single register write + */ +static int cap1066_write_reg(struct i2c_client *client, u8 reg, u8 val) +{ + int ret; + + ret = i2c_smbus_write_byte_data(client, reg, val); + if (ret < 0) { + printk(KERN_ERR PFX "write failed: %d\n", ret); + return ret; + } + return 0; +} + +/* + * called when an smbus device is detected, make sure it's a cap1066 + */ +static int cap1066_detect(struct i2c_client *client, + struct i2c_board_info *info) + +{ + int ret; + u8 vid, did; + const char *name = NULL; + + ret = cap1066_read_reg(client, SMSC_REG_VID, &vid); + if (ret) + return ret; + + ret = cap1066_read_reg(client, SMSC_REG_DID, &did); + if (ret) + return ret; + + if (vid != SMSC_CAP1066_VID) + goto no_dev; + + switch (did) { + case SMSC_CAP1066_DID: + name = "cap1066"; + break; + case SMSC_CAP1166_DID: + name = "cap1166"; + break; + default: + goto no_dev; + } + + printk(KERN_INFO PFX "detected SMSC %s chip\n", name); + if (info) + strlcpy(info->type, name, I2C_NAME_SIZE); + return 0; + +no_dev: + printk(KERN_ERR PFX "bad vid/did: 0x%04x/0x%04x\n", vid, did); + return -ENODEV; +} + +/* + * reset registers value + */ +static int cap1066_init_hw(struct i2c_client *client) +{ + unsigned int i; + u8 did; + int ret; + + static const u8 init_regs[] = { + /* power on */ + SMSC_REG_MAIN_CTRL, 0x0, + + /* default sensitivity */ + SMSC_REG_DATA_SENSITIVITY, 0x2f, + + /* max duration */ + SMSC_REG_SENS_CFG, 0xf4, + + /* default configuration */ + SMSC_REG_CFG, 0x38, + + /* open drain output on all gpios */ + SMSC_REG_LED_OUT_TYPE, 0x00, + + /* link leds with sensors */ + SMSC_REG_LED_LINK, 0x3f, + + /* setup direct mode */ + SMSC_REG_LED_BEHAVIOUR1, 0x00, + SMSC_REG_LED_BEHAVIOUR2, 0x00, + + /* set led duty cycle min/max to 10% => 100% */ + SMSC_REG_LED_DIRECT_DCYCLE, + (DEFAULT_DUTY_CYCLE_MAX << 4) | + (DEFAULT_DUTY_CYCLE_MIN), + + /* set ramp rate time to 500ms/250ms */ + SMSC_REG_LED_DIRECT_RAMP_RATE, + (DEFAULT_RAMP_TIME_RISE << 3) | + (DEFAULT_RAMP_TIME_FALL), + }; + + static const u8 init_cap11_regs[] = { + /* default configuration2 */ + SMSC_REG_CFG2, 0x44, + }; + + for (i = 0; i < ARRAY_SIZE(init_regs); i += 2) { + int ret; + + ret = cap1066_write_reg(client, + init_regs[i], init_regs[i + 1]); + if (ret) + return ret; + } + + ret = cap1066_read_reg(client, SMSC_REG_DID, &did); + if (ret) + return ret; + + if (did != SMSC_CAP1166_DID) + return 0; + + for (i = 0; i < ARRAY_SIZE(init_cap11_regs); i += 2) { + int ret; + + ret = cap1066_write_reg(client, + init_cap11_regs[i], + init_cap11_regs[i + 1]); + if (ret) + return ret; + } + + return 0; +} + +/* + * input core poll callback + */ +static void cap1066_input_poll(struct input_polled_dev *dev) +{ + struct cap1066_priv *priv = dev->private; + struct input_dev *input = dev->input; + unsigned int i; + int ret; + u8 stat; + + if (priv->has_irq_gpio) { + if (gpio_get_value(priv->irq_gpio)) + return; + } + + /* clear interrupt flag */ + cap1066_write_reg(priv->client, SMSC_REG_MAIN_CTRL, 0); + + ret = cap1066_read_reg(priv->client, SMSC_REG_BTN_STATUS1, &stat); + if (ret) { + printk(KERN_ERR PFX "unable to read status\n"); + return; + } + + for (i = 0; i < CAP1066_MAX_BTNS; i++) + input_report_key(input, priv->keymap[i], + (stat & (1 << i)) ? 1 : 0); + input_sync(input); +} + +#define to_cap1066_led_dev(Dev) container_of(Dev, struct cap1066_led_dev, dev) + +/* + * called when all sysfs references to the cap1066_led_dev are gone. + */ +static void cap1066_led_dev_release(struct device *dev) +{ + struct cap1066_led_dev *led_dev; + + led_dev = to_cap1066_led_dev(dev); + kfree(led_dev); +} + +static int is_white(int c) +{ + return c == '\0' || c == ' ' || c == '\t' || c == '\n' || c == '\r'; +} + +/* + * store a new control value for a given cap1066_led_dev: + * - auto means that the led is linked to the capacitive keys + * - on means that the led is always on + * - off means that the led is always off + */ +static ssize_t store_control(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct cap1066_led_dev *led_dev; + int new_mode; + int read_len = 0; + const char *end; + int key; + u8 reg; + struct i2c_client *client; + static const char *valid_keys[] = { + [E_SMSC_CAP1066_LED_MODE_AUTO] = "auto", + [E_SMSC_CAP1066_LED_MODE_ON] = "on", + [E_SMSC_CAP1066_LED_MODE_OFF] = "off", + }; + + + led_dev = to_cap1066_led_dev(dev); + client = led_dev->parent_priv->client; + + if (is_white(*buf)) + /* + * eat white spaces silently, upper layer will call us + * again. + */ + return 1; + + for (key = 0; key < ARRAY_SIZE(valid_keys); ++key) { + if (count < strlen(valid_keys[key])) + continue ; + if (!strncmp(buf, valid_keys[key], strlen(valid_keys[key]))) { + break; + } + } + + if (key == ARRAY_SIZE(valid_keys)) { + /* + * end of valid_keys array reached and nothing valid + * was recognized. + */ + printk(KERN_ERR PFX "invalid control value.\n"); + return -EINVAL; + } + new_mode = key; + read_len = strlen(valid_keys[key]); + + /* + * check that no garbage is present at end of input. + */ + end = buf + read_len; + if (end < buf + count && !is_white(*end)) { + /* + * garbage at end of input. + */ + printk(KERN_ERR PFX "garbage at end of value for led " + "control.\n"); + return -EINVAL; + } + + if (new_mode == led_dev->led_mode) + return read_len; + + if (new_mode == E_SMSC_CAP1066_LED_MODE_AUTO) { + cap1066_read_reg(client, SMSC_REG_LED_LINK, ®); + reg |= (1 << led_dev->led_index); + cap1066_write_reg(client, SMSC_REG_LED_LINK, reg); + } else { + cap1066_read_reg(client, SMSC_REG_LED_LINK, ®); + reg &= ~(1 << led_dev->led_index); + cap1066_write_reg(client, SMSC_REG_LED_LINK, reg); + + cap1066_read_reg(client, SMSC_REG_LED_OUTPUT_CTL, ®); + if (new_mode == E_SMSC_CAP1066_LED_MODE_ON) + reg |= (1 << led_dev->led_index); + else + reg &= ~(1 << led_dev->led_index); + cap1066_write_reg(client, SMSC_REG_LED_OUTPUT_CTL, reg); + } + led_dev->led_mode = new_mode; + + return read_len; +} + +static ssize_t show_control(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct cap1066_led_dev *led_dev; + const char *str; + + led_dev = to_cap1066_led_dev(dev); + switch (led_dev->led_mode) { + case E_SMSC_CAP1066_LED_MODE_AUTO: + str = "auto"; + break; + + case E_SMSC_CAP1066_LED_MODE_ON: + str = "on"; + break; + + case E_SMSC_CAP1066_LED_MODE_OFF: + str = "off"; + break; + + default: + str = "invalid"; + break; + } + + return sprintf(buf, "%s\n", str); +} + +static DEVICE_ATTR(control, S_IWUSR | S_IRUSR, show_control, store_control); + +static struct device_attribute *cap1066_led_dev_attrs[] = { + &dev_attr_control, +}; + +/* + * helper used to create all attributes given in the attr array. + * + * if something goes wrong during creation, remove attributes that + * have already been created. + */ +static int create_sysfs_files(struct device *dev, + struct device_attribute **attrs, + size_t count) +{ + int created; + int error = 0; + + for (created = 0; created < count; ++created) { + error = device_create_file(dev, attrs[created]); + if (error) + break; + } + + if (!error) + /* + * no errors, can return. + */ + return 0; + + /* + * errors during creation, remove already created + * files. + */ + while (--created >= 0) + device_remove_file(dev, attrs[created]); + + return error; +} + +/* + * create a led device. This will create a new directory in the sysfs + * base of the parent. a symlink will be created if a button name is + * found via get_keycode_btn_name(). + */ +static struct cap1066_led_dev *cap1066_create_led_dev(struct device *parent, + struct cap1066_priv *priv, + int index, int key_code) +{ + struct cap1066_led_dev *dev; + int error = 0; + + dev = kzalloc(sizeof (*dev), GFP_KERNEL); + if (!dev) + return NULL; + + dev->led_index = index; + dev->parent_priv = priv; + dev_set_name(&dev->dev, "led_btn_%i", index); + dev->dev.release = cap1066_led_dev_release; + dev->dev.parent = parent; + if (device_register(&dev->dev) < 0) { + kfree(dev); + return NULL; + } + + /* + * create sysfs attributes. + */ + error = create_sysfs_files(&dev->dev, cap1066_led_dev_attrs, + ARRAY_SIZE(cap1066_led_dev_attrs)); + if (error) { + device_unregister(&dev->dev); + return NULL; + } + + /* + * create sysfs symlinks to friendly names, wherever possible. + */ + dev->btn_link = get_keycode_btn_name(key_code); + if (dev->btn_link) { + error = sysfs_create_link(&parent->kobj, &dev->dev.kobj, + dev->btn_link); + if (error) + dev->btn_link = NULL; + } + return dev; +} + +static void cap1066_remove_led_dev(struct cap1066_led_dev *dev) +{ + int i; + + if (dev->btn_link) + sysfs_remove_link(&dev->dev.parent->kobj, dev->btn_link); + + for (i = 0; i < ARRAY_SIZE(cap1066_led_dev_attrs); ++i) + device_remove_file(&dev->dev, cap1066_led_dev_attrs[i]); + device_unregister(&dev->dev); + + /* + * dev->release() kfree the cap1066_led_dev struct + */ +} + +/* + * helper to exctract an unsigned long from the buffer given in + * parameter. + * + * first store buf in a zero terminated string and strtoul() it. + */ +static int get_ulong(const char *buf, size_t count, unsigned long *ret) +{ + char local_buf[32]; + unsigned long val; + const char *end; + + strncpy(local_buf, buf, min(count , sizeof (local_buf))); + local_buf[min(count, sizeof (local_buf) - 1)] = 0; + + val = simple_strtoul(local_buf, (char**)&end, 0); + if (!is_white(*end)) + /* + * garbage after end of input. + */ + return -EINVAL; + + *ret = val; + + return 0; +} + +/* + * duty cycle sysfs callbacks: things may not work as expected if + * duty_cycle_min is >= duty_cycle_max. + * + * values that can be written in duty_cycle_max/duty_cycle_min + * attributes can be on the range [0, 16 [. + * + * 0 means the lowest possible pwm duty cycle. + * 1 means the highest possible pwm duty cycle. + */ + +static ssize_t store_duty_cycle_min(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + unsigned long val; + struct i2c_client *client; + struct cap1066_priv *priv; + int error; + u8 reg; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + if (is_white(*buf)) + return 1; + + error = get_ulong(buf, count, &val); + if (error) + return error; + + if (val > 0xf) + return -ERANGE; + + cap1066_read_reg(client, SMSC_REG_LED_DIRECT_DCYCLE, ®); + reg &= ~0xf; + reg |= val; + cap1066_write_reg(client, SMSC_REG_LED_DIRECT_DCYCLE, reg); + + priv->duty_cycle_min = val; + + pr_debug(PFX "store_duty_cycle_min: reg = 0x%02x\n", reg); + return count; +} + +static ssize_t show_duty_cycle_min(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct i2c_client *client; + struct cap1066_priv *priv; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + return sprintf(buf, "%u\n", priv->duty_cycle_min); +} + +static ssize_t store_duty_cycle_max(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + unsigned long val; + struct i2c_client *client; + struct cap1066_priv *priv; + int error; + u8 reg; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + if (is_white(*buf)) + return 1; + + error = get_ulong(buf, count, &val); + if (error) + return error; + + if (val > 0xf) + return -ERANGE; + + cap1066_read_reg(client, SMSC_REG_LED_DIRECT_DCYCLE, ®); + reg &= ~0xf0; + reg |= val << 4; + cap1066_write_reg(client, SMSC_REG_LED_DIRECT_DCYCLE, reg); + + priv->duty_cycle_max = val; + + pr_debug(PFX "store_duty_cycle_max: reg = 0x%02x\n", reg); + return count; +} + +static ssize_t show_duty_cycle_max(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct i2c_client *client; + struct cap1066_priv *priv; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + return sprintf(buf, "%u\n", priv->duty_cycle_max); +} + +/* + * convert millisecond value to a "raw" value ready to be written to + * the register. + */ +static u8 msec_to_raw_ramp_time(unsigned long msec) +{ + u8 ret; + + if (msec <= 1500) + /* + * register handles 250 msec increments if below 1500 + * msec. + */ + ret = msec / 250; + else + /* + * there is no 1750 msec step, and 2000 msec is + * encoded as 0x7. + */ + ret = 0x7; + + return ret; +} + +/* + * convert raw register value to a millisecond value. + */ +static unsigned long raw_ramp_time_to_msec(u8 raw) +{ + unsigned long ret; + + if (raw < 7) + ret = 250 * raw; + else + ret = 2000; + + return ret; +} + +/* + * ramp time sysfs callbacks. delays are not reliable if programmed + * want time is higher than 1000 msec. + * + * values that can be written are on the range [0, 2000] and are given + * in milliseconds. Values higher than 2000 are clamped to 2000. shown + * values are rounded up to the next value supported by the hardware. + */ + +static ssize_t store_ramp_time_rise(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + unsigned long val; + u8 raw_val; + struct i2c_client *client; + struct cap1066_priv *priv; + int error; + u8 reg; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + if (is_white(*buf)) + return 1; + + error = get_ulong(buf, count, &val); + if (error) + return error; + + raw_val = msec_to_raw_ramp_time(val); + + cap1066_read_reg(client, SMSC_REG_LED_DIRECT_RAMP_RATE, ®); + reg &= ~(0x7 << 3); + reg |= raw_val << 3; + cap1066_write_reg(client, SMSC_REG_LED_DIRECT_RAMP_RATE, reg); + + priv->raw_ramp_time_rise = raw_val; + + pr_debug(PFX "store_ramp_time_rise: reg = %02x\n", reg); + return count; +} + +static ssize_t show_ramp_time_rise(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct i2c_client *client; + struct cap1066_priv *priv; + unsigned long msec; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + msec = raw_ramp_time_to_msec(priv->raw_ramp_time_rise); + + return sprintf(buf, "%lu\n", msec); +} + +static ssize_t store_ramp_time_fall(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + unsigned long val; + u8 raw_val; + struct i2c_client *client; + struct cap1066_priv *priv; + int error; + u8 reg; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + if (is_white(*buf)) + return 1; + + error = get_ulong(buf, count, &val); + if (error) + return error; + + raw_val = msec_to_raw_ramp_time(val); + + cap1066_read_reg(client, SMSC_REG_LED_DIRECT_RAMP_RATE, ®); + reg &= ~0x7; + reg |= raw_val; + cap1066_write_reg(client, SMSC_REG_LED_DIRECT_RAMP_RATE, reg); + + priv->raw_ramp_time_fall = raw_val; + + pr_debug(PFX "store_ramp_time_rise: reg = %02x\n", reg); + return count; +} + +static ssize_t show_ramp_time_fall(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct i2c_client *client; + struct cap1066_priv *priv; + unsigned long msec; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + msec = raw_ramp_time_to_msec(priv->raw_ramp_time_fall); + + return sprintf(buf, "%lu\n", msec); +} + +#define MTOUCH_ENABLE (1 << 7) +#define MTOUCH_COUNT_MASK (3 << 2) +#define MTOUCH_COUNT_SHIFT (2) + +/* + * touch limit handling: the hardware can report at most 1 to 4 key + * press event or no limit at all. + * + * Accepted values in touch_limit attribte: + * 0 -> no limit + * [1, 4] -> limit to the indicated count + * [4, +inf [ -> invalid + */ +static ssize_t store_touch_limit(struct device *dev, + struct device_attribute *attr, const char *buf, + size_t count) +{ + struct i2c_client *client; + unsigned long limit; + int err; + u8 mtouch_reg; + + client = to_i2c_client(dev); + + if (is_white(*buf)) + return 1; + + err = get_ulong(buf, count, &limit); + if (err) + return err; + + if (limit > 4) + return -EINVAL; + + if (limit == 0) { + mtouch_reg = 0; + } else { + mtouch_reg = MTOUCH_ENABLE | + ((limit - 1) << MTOUCH_COUNT_SHIFT); + } + cap1066_write_reg(client, SMSC_REG_MTOUCH_CFG_REG, mtouch_reg); + + return count; +} + +static ssize_t show_touch_limit(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct i2c_client *client; + u8 mtouch_reg; + + client = to_i2c_client(dev); + + cap1066_read_reg(client, SMSC_REG_MTOUCH_CFG_REG, &mtouch_reg); + + if (mtouch_reg & MTOUCH_ENABLE) { + u8 count = (mtouch_reg & MTOUCH_COUNT_MASK) >> + MTOUCH_COUNT_SHIFT; + return sprintf(buf, "%d\n", count + 1); + } else { + return sprintf(buf, "0\n"); + } +} + +static DEVICE_ATTR(duty_cycle_min, S_IRUSR | S_IWUSR, show_duty_cycle_min, + store_duty_cycle_min); + +static DEVICE_ATTR(duty_cycle_max, S_IRUSR | S_IWUSR, show_duty_cycle_max, + store_duty_cycle_max); + +static DEVICE_ATTR(ramp_time_rise, S_IRUSR | S_IWUSR, show_ramp_time_rise, + store_ramp_time_rise); + +static DEVICE_ATTR(ramp_time_fall, S_IRUSR | S_IWUSR, show_ramp_time_fall, + store_ramp_time_fall); + +static DEVICE_ATTR(touch_limit, S_IWUSR | S_IRUSR, show_touch_limit, + store_touch_limit); + +static struct device_attribute *cap1066_base_attributes[] = { + &dev_attr_duty_cycle_min, + &dev_attr_duty_cycle_max, + &dev_attr_ramp_time_rise, + &dev_attr_ramp_time_fall, + &dev_attr_touch_limit, +}; + + +/* + * i2c core probe callback, called after sucessful detect + */ +static int cap1066_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct input_polled_dev *poll_dev; + struct input_dev *input; + struct cap1066_priv *priv; + int ret, i; + + ret = cap1066_detect(client, NULL); + if (ret) + dev_warn(&client->dev, "unknown cap1x66 device.\n"); + + /* initialize controller */ + ret = cap1066_init_hw(client); + if (ret) + return ret; + + /* allocate context */ + priv = kzalloc(sizeof (*priv), GFP_KERNEL); + poll_dev = input_allocate_polled_device(); + if (!priv || !poll_dev) { + ret = -ENOMEM; + goto out_fail; + } + + /* + * must match what has been setup in cap1066_init_hw(). + */ + priv->duty_cycle_min = DEFAULT_DUTY_CYCLE_MIN; + priv->duty_cycle_max = DEFAULT_DUTY_CYCLE_MAX; + priv->raw_ramp_time_rise = DEFAULT_RAMP_TIME_RISE; + priv->raw_ramp_time_fall = DEFAULT_RAMP_TIME_FALL; + + if (client->dev.platform_data) { + struct smsc_cap1066_pdata *pdata; + + pdata = client->dev.platform_data; + memcpy(priv->keymap, pdata->key_map, sizeof (pdata->key_map)); + priv->has_irq_gpio = pdata->has_irq_gpio; + priv->irq_gpio = pdata->irq_gpio; + } else + memcpy(priv->keymap, default_map, sizeof (default_map)); + + if (priv->has_irq_gpio) + gpio_direction_input(priv->irq_gpio); + + priv->poll_dev = poll_dev; + priv->client = client; + + poll_dev->private = priv; + poll_dev->poll = cap1066_input_poll; + poll_dev->poll_interval = 50 /* ms */; + + input = poll_dev->input; + input->name = "smsc_cap1066"; + input->phys = "smsc_cap1066/input0"; + input->id.bustype = BUS_I2C; + input->dev.parent = &client->dev; + + input->keycode = priv->keymap; + input->keycodemax = ARRAY_SIZE(priv->keymap); + input->keycodesize = sizeof (unsigned short); + + set_bit(EV_REP, input->evbit); + set_bit(EV_KEY, input->evbit); + for (i = 0; i < ARRAY_SIZE(priv->keymap); i++) + set_bit(priv->keymap[i], input->keybit); + + i2c_set_clientdata(client, priv); + + ret = input_register_polled_device(poll_dev); + if (ret) + goto out_fail; + + for (i = 0; i < ARRAY_SIZE(priv->keymap); ++i) { + if (!priv->keymap[i]) + continue; + priv->led_devices[i] = + cap1066_create_led_dev(&client->dev, + priv, i, priv->keymap[i]); + } + + if (create_sysfs_files(&client->dev, cap1066_base_attributes, + ARRAY_SIZE(cap1066_base_attributes)) < 0) + goto out_free_led_devs; + + return 0; + +out_free_led_devs: + for (i = 0; i < ARRAY_SIZE(priv->keymap); ++i) + if (priv->led_devices[i]) + cap1066_remove_led_dev(priv->led_devices[i]); +out_fail: + input_free_polled_device(poll_dev); + kfree(priv); + i2c_set_clientdata(client, NULL); + return ret; +} + +/* + * i2c core remove callback + */ +static int cap1066_remove(struct i2c_client *client) +{ + int i; + struct cap1066_priv *priv = i2c_get_clientdata(client); + + for (i = 0; i < ARRAY_SIZE(cap1066_base_attributes); ++i) + device_remove_file(&client->dev, cap1066_base_attributes[i]); + + for (i = 0; i < ARRAY_SIZE(priv->keymap); ++i) { + if (priv->led_devices[i]) + cap1066_remove_led_dev(priv->led_devices[i]); + } + + input_unregister_polled_device(priv->poll_dev); + input_free_polled_device(priv->poll_dev); + kfree(priv); + + return 0; +} + +static struct i2c_driver cap1066_driver = { + .driver = { + .name = "cap1066", + }, + .probe = cap1066_probe, + .remove = cap1066_remove, + .id_table = cap1066_id, + + .detect = cap1066_detect, + .class = I2C_CLASS_HWMON, + .address_list = normal_i2c, +}; + +static int __init cap1066_init(void) +{ + return i2c_add_driver(&cap1066_driver); +} + +static void __exit cap1066_exit(void) +{ + i2c_del_driver(&cap1066_driver); +} + + +MODULE_AUTHOR("Maxime Bizon "); +MODULE_DESCRIPTION("SMSC CAP1066 driver"); +MODULE_LICENSE("GPL"); + +module_init(cap1066_init); +module_exit(cap1066_exit); diff -Nruw linux-3.6.7-fbx/drivers/media/dvb/tango2./Kconfig linux-3.6.7-fbx/drivers/media/dvb/tango2/Kconfig --- linux-3.6.7-fbx/drivers/media/dvb/tango2./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/media/dvb/tango2/Kconfig 2014-04-17 16:28:09.921030592 +0200 @@ -0,0 +1,11 @@ +config DVB_TANGO2 + tristate "Tango2 DVB adapter" + depends on DVB_CORE && ARCH_FBX5_B + select I2C + select I2C_ALGOBIT + select DVB_TDA1004X + select DVB_PLL + +config DVB_TANGO2_TESTBED + bool "extended testing and useful error codes" + depends on DVB_TANGO2 diff -Nruw linux-3.6.7-fbx/drivers/media/dvb/tango2./Makefile linux-3.6.7-fbx/drivers/media/dvb/tango2/Makefile --- linux-3.6.7-fbx/drivers/media/dvb/tango2./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/media/dvb/tango2/Makefile 2014-04-17 16:28:09.921030592 +0200 @@ -0,0 +1,5 @@ +obj-$(CONFIG_DVB_TANGO2) = tango2_dvb.o + +tango2_dvb-objs := tango2.o + +EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ diff -Nruw linux-3.6.7-fbx/drivers/misc/hdmi-cec./Kconfig linux-3.6.7-fbx/drivers/misc/hdmi-cec/Kconfig --- linux-3.6.7-fbx/drivers/misc/hdmi-cec./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/misc/hdmi-cec/Kconfig 2013-09-03 14:19:32.586091274 +0200 @@ -0,0 +1,15 @@ +menu "HDMI CEC support" + +config HDMI_CEC + tristate "HDMI CEC (Consumer Electronics Control) support" + ---help--- + HDMI Consumer Electronics Control support. + +config HDMI_CEC_REMOTI + tristate "RemoTI CEC driver" + depends on HDMI_CEC + select REMOTI + ---help--- + HDMI CEC driver using RemoTI IPCs. + +endmenu diff -Nruw linux-3.6.7-fbx/drivers/misc/hdmi-cec./Makefile linux-3.6.7-fbx/drivers/misc/hdmi-cec/Makefile --- linux-3.6.7-fbx/drivers/misc/hdmi-cec./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/misc/hdmi-cec/Makefile 2013-09-03 14:19:32.586091274 +0200 @@ -0,0 +1,6 @@ +obj-$(CONFIG_HDMI_CEC) += hdmi-cec.o +hdmi-cec-objs += core.o dev.o + +# drivers +obj-$(CONFIG_HDMI_CEC_REMOTI) += remoti-cec.o +remoti-cec-objs := remoti.o diff -Nruw linux-3.6.7-fbx/drivers/misc/remoti./Kconfig linux-3.6.7-fbx/drivers/misc/remoti/Kconfig --- linux-3.6.7-fbx/drivers/misc/remoti./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/misc/remoti/Kconfig 2013-09-03 14:19:32.590091350 +0200 @@ -0,0 +1,26 @@ +menu "RemoTI support" + +config REMOTI + tristate "RemoTI support" + depends on FBX6HD + ---help--- + Texas Instruments RemoTI stack. + +config REMOTI_LEDS + tristate "RemoTI LEDS support" + depends on REMOTI + depends on LEDS_CLASS + ---help--- + RemoTI LEDS class driver support. + +config REMOTI_GPIO + tristate "RemoTI gpio support" + depends on REMOTI + ---help--- + gpiochip driver for the RemoTI RNP + +config REMOTI_USER + tristate "RemoTI userspace access" + depends on REMOTI + +endmenu diff -Nruw linux-3.6.7-fbx/drivers/misc/remoti./Makefile linux-3.6.7-fbx/drivers/misc/remoti/Makefile --- linux-3.6.7-fbx/drivers/misc/remoti./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/misc/remoti/Makefile 2013-09-03 14:19:32.590091350 +0200 @@ -0,0 +1,9 @@ +obj-$(CONFIG_REMOTI) += remoti.o +obj-$(CONFIG_REMOTI_GPIO) += remoti-gpio.o +obj-$(CONFIG_REMOTI_LEDS) += remoti-leds.o +obj-$(CONFIG_REMOTI_USER) += remoti-user.o + +remoti-objs := core.o core-sysfs.o +remoti-gpio-objs := gpio.o +remoti-leds-objs := leds.o +remoti-user-objs := user.o diff -Nruw linux-3.6.7-fbx/drivers/net/ethernet/sigma./Kconfig linux-3.6.7-fbx/drivers/net/ethernet/sigma/Kconfig --- linux-3.6.7-fbx/drivers/net/ethernet/sigma./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/ethernet/sigma/Kconfig 2013-09-03 14:19:32.598091504 +0200 @@ -0,0 +1,24 @@ +# +# Marvell device configuration +# + +config NET_VENDOR_SIGMA + bool "Sigma Design devices" + default y + depends on TANGO2 + +if NET_VENDOR_SIGMA + +config TANGO2_ENET + tristate "SMP863x Builtin Ethernet support" + select MII + select CRC32 + help + This option adds support for the SMP863x integrated Ethernet + controller. This driver uses NAPI and generic Linux MII + support. + +config TANGO2_PCINET_H + tristate "SMP863x network over PCI support (smp863x side)" + +endif # NET_VENDOR_SIGMA diff -Nruw linux-3.6.7-fbx/drivers/net/ethernet/sigma./Makefile linux-3.6.7-fbx/drivers/net/ethernet/sigma/Makefile --- linux-3.6.7-fbx/drivers/net/ethernet/sigma./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/ethernet/sigma/Makefile 2013-09-03 14:19:32.598091504 +0200 @@ -0,0 +1,2 @@ +obj-$(CONFIG_TANGO2_ENET) += tango2_enet/tango2_enet.o +obj-$(CONFIG_TANGO2_PCINET_H) += tango2_pcinet/tango2_pcinet_h.o diff -Nruw linux-3.6.7-fbx/drivers/net/ethernet/wintegra./Kconfig linux-3.6.7-fbx/drivers/net/ethernet/wintegra/Kconfig --- linux-3.6.7-fbx/drivers/net/ethernet/wintegra./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/ethernet/wintegra/Kconfig 2013-09-03 14:19:32.598091504 +0200 @@ -0,0 +1,10 @@ +config NET_VENDOR_WINTEGRA + bool + +config WINTEGRA_WINPATH3_ETH + tristate "Wintegra Winpath3 internal mac support" + depends on WINTEGRA_WINPATH3 + select NET_VENDOR_WINTEGRA + select NET_CORE + select MII + select PHYLIB diff -Nruw linux-3.6.7-fbx/drivers/net/ethernet/wintegra./Makefile linux-3.6.7-fbx/drivers/net/ethernet/wintegra/Makefile --- linux-3.6.7-fbx/drivers/net/ethernet/wintegra./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/net/ethernet/wintegra/Makefile 2013-09-03 14:19:32.598091504 +0200 @@ -0,0 +1 @@ +obj-$(CONFIG_WINTEGRA_WINPATH3_ETH) += wp3_eth.o diff -Nruw linux-3.6.7-fbx/drivers/platform/intelce./Kconfig linux-3.6.7-fbx/drivers/platform/intelce/Kconfig --- linux-3.6.7-fbx/drivers/platform/intelce./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/platform/intelce/Kconfig 2013-09-03 14:19:32.606091656 +0200 @@ -0,0 +1,18 @@ +# +# IntelCE devices configuration +# + +menu "IntelCE devices" + +config INTELCE_GPIO + tristate "GPIO support" + select ARCH_REQUIRE_GPIOLIB + ---help--- + IntelCE 3100/4100 GPIO support. + +config INTELCE_DFX + tristate "DFX reporting support" + ---help--- + IntelCE 3100/4100 DFX fuse reporting support. + +endmenu diff -Nruw linux-3.6.7-fbx/drivers/platform/intelce./Makefile linux-3.6.7-fbx/drivers/platform/intelce/Makefile --- linux-3.6.7-fbx/drivers/platform/intelce./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/platform/intelce/Makefile 2013-09-03 14:19:32.606091656 +0200 @@ -0,0 +1,2 @@ +obj-$(CONFIG_INTELCE_GPIO) += gpio-intelce.o +obj-$(CONFIG_INTELCE_DFX) += dfx.o diff -Nruw linux-3.6.7-fbx/drivers/platform/tango2./Kconfig linux-3.6.7-fbx/drivers/platform/tango2/Kconfig --- linux-3.6.7-fbx/drivers/platform/tango2./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/platform/tango2/Kconfig 2013-09-03 14:19:32.606091656 +0200 @@ -0,0 +1,30 @@ +# +# TANGO2 devices configuration +# + +menu "Tango2 devices" + depends on TANGO2 + +config TANGO2_FIP + tristate "Front panel support" + select INPUT + ---help--- + Tango2 FIP front panel support. + +config TANGO2_GPIO + tristate "GPIO sysfs support" + ---help--- + Export GPIO attributes in sysfs. + +config TANGO2_IR + tristate "IR support" + ---help--- + Tango2 IR (NEC/RC5/RC6) support. + +config TANGO2_FB + tristate "Framebuffer support" + depends on FB + ---help--- + Tango2 framebuffer support. + +endmenu diff -Nruw linux-3.6.7-fbx/drivers/platform/tango2./Makefile linux-3.6.7-fbx/drivers/platform/tango2/Makefile --- linux-3.6.7-fbx/drivers/platform/tango2./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/drivers/platform/tango2/Makefile 2013-09-03 14:19:32.606091656 +0200 @@ -0,0 +1,6 @@ +# Makefile for the TANGO2 device drivers + +obj-$(CONFIG_TANGO2_FIP) += fip.o +obj-$(CONFIG_TANGO2_GPIO) += gpio.o +obj-$(CONFIG_TANGO2_IR) += ir.o +obj-$(CONFIG_TANGO2_FB) += fb.o --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/drivers/spi/orion_tdm_spi.c 2013-09-03 14:19:32.606091656 +0200 @@ -0,0 +1,599 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define DRIVER_NAME "orion_tdm_spi" + +/* + * registers + */ +#define PCM_CTRL_REG 0x0000 +#define PCM_DAA_CSS_CTRL_MASK (1 << 15) + +#define SPI_CLK_PRESCALE_REG 0x3100 +#define SCLOCK_LOW_SHIFT 0 +#define SCLOCK_LOW_MASK (0xff << SCLOCK_LOW_SHIFT) +#define SCLOCK_HIGH_SHIFT 8 +#define SCLOCK_HIGH_MASK (0xff << SCLOCK_HIGH_SHIFT) + +#define SPI_GLOBAL_CTRL_REG 0x3104 +#define CODEC_ENABLE_MASK (1 << 0) + +#define SPI_CTRL_REG 0x3108 +#define SPI_STAT_MASK (1 << 10) + +#define SPI_CODEC_ACCESS_L_REG 0x3130 +#define ACCESS_BYTE0_SHIFT 0 +#define ACCESS_BYTE1_SHIFT 8 + +#define SPI_CODEC_ACCESS_H_REG 0x3134 +#define ACCESS_BYTE2_SHIFT 0 +#define ACCESS_BYTE3_SHIFT 8 + +#define SPI_REG_ACCESS_CTRL_REG 0x3138 +#define BYTES_TO_XFER_MASK 0x3 +#define SPI_LSB_MSB_MASK (1 << 2) +#define SPI_RD_WR_MASK (1 << 3) +#define SPI_BYTES_TO_READ_SHIFT 4 +#define SPI_LO_SPEED_CLK_MASK (1 << 5) +#define SPI_READ_CS_HOLD_SHIFT 6 + +#define SPI_READ_DATA_REG 0x313c + +#define SPI_REG_ACCESS_CTRL1_REG 0x3140 +#define SPI_WRITE_CS_HOLD_SHIFT 0 + +#define SPI_OUT_EN_CTRL_REG 0x4000 +#define SPI_OUT_EN_DISABLE_MASK (1 << 0) + + +struct orion_tdm_spi { + struct spi_master *master; + void __iomem *base; + + unsigned int max_speed; + unsigned int min_speed; + + /* current configured speed/divs for each CS, drivers uses "low" + * for CS0 and "high" for CS1 */ + unsigned int speeds[2]; + u32 divs[2]; + + unsigned int current_cs; + struct orion_tdm_spi_info *spi_info; + struct clk *clk; +}; + +MODULE_ALIAS("platform:" DRIVER_NAME); + +static inline u32 spi_readl(struct orion_tdm_spi *priv, u32 reg) +{ + u32 val; + + val = readl(priv->base + reg); +/* printk("spi_readl: readl at %08x => 0x%08x\n", */ +/* priv->base + reg, val); */ + return val; +} + +static inline void spi_writel(struct orion_tdm_spi *priv, u32 val, u32 reg) +{ +/* printk("spi_writl: writl at %08x <= 0x%08x\n", */ +/* priv->base + reg, val); */ + writel(val, priv->base + reg); +} + +static int spi_baudrate_set(struct orion_tdm_spi *priv, + unsigned int cs, unsigned int speed) +{ + u32 tclk_hz; + u32 div, val; + + if (priv->speeds[cs] == speed) + return 0; + + tclk_hz = clk_get_rate(priv->clk); + + /* find divider, the supported values are: 2...254 (even only) */ + div = DIV_ROUND_UP(tclk_hz, speed); + div = roundup(div, 2); + + if (div > 254) + return 1; + + if (div < 2) + div = 2; + + /* don't reprogram div if not needed */ + if (priv->divs[cs] == div) { + priv->speeds[cs] = speed; + return 0; + } + + /* Convert the rate to SPI clock divisor value. */ + val = spi_readl(priv, SPI_CLK_PRESCALE_REG); + if (cs) { + val &= ~SCLOCK_HIGH_MASK; + val |= div << SCLOCK_HIGH_SHIFT; + } else { + val &= ~SCLOCK_LOW_MASK; + val |= div << SCLOCK_LOW_SHIFT; + } + spi_writel(priv, val, SPI_CLK_PRESCALE_REG); + + priv->speeds[cs] = speed; + priv->divs[cs] = div; + return 0; +} + +static void spi_set_cs(struct orion_tdm_spi *priv, struct spi_device *spi, + int active) +{ + struct orion_tdm_spi_info *spi_info; + int gpio; + + spi_info = priv->spi_info; + + /* set correct cs in hardware */ + if (spi->chip_select != priv->current_cs) { + u32 val; + + val = spi_readl(priv, PCM_CTRL_REG); + if (spi->chip_select) + val |= PCM_DAA_CSS_CTRL_MASK; + else + val &= ~PCM_DAA_CSS_CTRL_MASK; + spi_writel(priv, val, PCM_CTRL_REG); + priv->current_cs = spi->chip_select; + } + + /* if not using gpio, hardware moves cs for us */ + gpio = spi_info->cs_use_gpio[priv->current_cs]; + if (gpio == -1) + return; + + gpio_set_value(gpio, 1 - active); +} + +static int do_spi_poll(struct orion_tdm_spi *priv) +{ + unsigned int loop; + u32 val; + + for (loop = 0; loop < 1000; loop++) { + val = spi_readl(priv, SPI_CTRL_REG); + if (!(val & SPI_STAT_MASK)) + return 0; + } + return 1; +} + +static int do_write_read(struct orion_tdm_spi *priv, struct spi_device *spi, + const u8 *tx, unsigned int tx_len, + u8 *rx, unsigned int rx_len) +{ + u32 val; + + if (do_spi_poll(priv)) { + dev_err(&spi->dev, "spi_poll timed out\n"); + return 1; + } + + val = tx[0]; + if (tx_len > 1) + val |= tx[1] << 8; + spi_writel(priv, val, SPI_CODEC_ACCESS_L_REG); + + if (tx_len > 2) { + val = tx[2]; + if (tx_len > 3) + val |= tx[3] << 8; + spi_writel(priv, val, SPI_CODEC_ACCESS_H_REG); + } + + + val = tx_len - 1; + if (rx_len) + val |= SPI_RD_WR_MASK; + if (rx_len > 1) + val |= (1 << SPI_BYTES_TO_READ_SHIFT); + if (spi->chip_select) { + /* note: bit set to 1 => use high speed */ + val |= SPI_LO_SPEED_CLK_MASK; + } + spi_writel(priv, val, SPI_REG_ACCESS_CTRL_REG); + + val = spi_readl(priv, SPI_CTRL_REG); + val |= SPI_STAT_MASK; + spi_writel(priv, val, SPI_CTRL_REG); + + if (do_spi_poll(priv)) { + dev_err(&spi->dev, "spi_poll timed out\n"); + return 1; + } + + if (rx_len) { + val = spi_readl(priv, SPI_READ_DATA_REG); + rx[0] = val & 0xff; + if (rx_len > 1) + rx[1] = (val >> 8) & 0xff; + } + + return 0; +} + +static int orion_tdm_spi_setup(struct spi_device *spi) +{ + struct orion_tdm_spi *priv; + + priv = spi_master_get_devdata(spi->master); + + if (spi->bits_per_word == 0) + spi->bits_per_word = 8; + + if (spi->bits_per_word != 8) { + dev_err(&spi->dev, "setup: unsupported transfer width %u\n", + spi->bits_per_word); + return -EINVAL; + } + + if ((spi->max_speed_hz == 0) || + (spi->max_speed_hz > priv->max_speed)) + spi->max_speed_hz = priv->max_speed; + + if (spi->max_speed_hz < priv->min_speed) { + dev_err(&spi->dev, "setup: requested speed too low %d Hz\n", + spi->max_speed_hz); + return -EINVAL; + } + + return 0; +} + +static int orion_tdm_spi_transfer(struct spi_device *spi, + struct spi_message *m) +{ + struct orion_tdm_spi *priv; + struct spi_transfer *t; + int want_write, cs_active; + + m->actual_length = 0; + m->status = 0; + +/* printk("orion_tdm_spi_transfer for device speed %u\n", */ +/* spi->max_speed_hz); */ + + /* reject invalid messages and transfers */ + if (list_empty(&m->transfers) || !m->complete) + return -EINVAL; + + priv = spi_master_get_devdata(spi->master); + + /* + * first pass for sanity check + * + * hardware is dumb, and can't read/write at the same + * time. Worst, you have to write at least one byte to be able + * to read, and you can't not read more than two bytes. + */ + want_write = 0; + + list_for_each_entry(t, &m->transfers, transfer_list) { + + if (!t->len) + continue; + + if (t->tx_buf && t->rx_buf) { + dev_err(&spi->dev, + "message rejected : " + "full duplex transfer not supported\n"); + m->status = -ENOTSUPP; + goto msg_done; + } + + if (!t->tx_buf && !t->rx_buf && t->len) { + dev_err(&spi->dev, + "message rejected : " + "invalid transfer data buffers\n"); + m->status = -EINVAL; + goto msg_done; + } + + /* check if forced transfer width is valid */ + if (t->bits_per_word && t->bits_per_word != 8) { + dev_err(&spi->dev, + "message rejected : " + "invalid transfer bits_per_word (%d bits)\n", + t->bits_per_word); + m->status = -EINVAL; + goto msg_done; + } + + /* check if forced transfer speed if ok */ + if (t->speed_hz && t->speed_hz < priv->min_speed) { + dev_err(&spi->dev, + "message rejected : " + "device min speed (%d Hz) exceeds " + "required transfer speed (%d Hz)\n", + priv->min_speed, t->speed_hz); + m->status = -EINVAL; + goto msg_done; + } + + if (t->tx_buf) + want_write += t->len; + if (t->rx_buf) { + if (t->len > 2) { + dev_err(&spi->dev, + "message rejected : " + "marvell dumb spi can't read " + "more than 2 bytes\n"); + m->status = -EINVAL; + goto msg_done; + + } + + if (want_write) + want_write = 0; + else { + dev_err(&spi->dev, + "message rejected : " + "marvell dumb spi can't read " + "without write first\n"); + m->status = -EINVAL; + goto msg_done; + } + } + } + +/* printk("SPI CS\n"); */ + spi_set_cs(priv, spi, 0); + cs_active = 0; + + /* do the actual transfer, we need to coalesce write and read + * transfer */ + list_for_each_entry(t, &m->transfers, transfer_list) { + unsigned int i, speed; + + if (!t->len) + continue; + + /* get and configure speed for this transfer */ + if (t->speed_hz) + speed = t->speed_hz; + else + speed = spi->max_speed_hz; + + if (spi_baudrate_set(priv, spi->chip_select, speed)) { + m->status = -EINVAL; + goto msg_done; + } + + /* write always one byte, if this is the last byte to + * transfer, lookahead next transfer and read if + * needed */ + BUG_ON(!t->tx_buf); + + for (i = 0; i < t->len;) { + struct spi_transfer *nt; + u8 *rx; + const u8 *tx; + unsigned int rx_len, tx_remain; + + rx = NULL; + nt = NULL; + rx_len = 0; + + tx_remain = t->len - i; + if (tx_remain == 1) { + struct list_head *e; + + /* last byte to write, check if next + * transfer is a read and coalesce */ + e = t->transfer_list.next; + if (e != &m->transfers) { + nt = list_entry(e, struct spi_transfer, + transfer_list); + if (nt->rx_buf) { + rx = nt->rx_buf; + rx_len = nt->len; + } else + nt = NULL; + } + } + + /* we can write 4 bytes at a time if not + * reading */ + if (tx_remain > 4) + tx_remain = 4; + else { + /* make sure we leave at least one + * byte in case we need to coalesce + * with next read */ + if (tx_remain > 1) + tx_remain--; + } + tx = t->tx_buf + i; + + if (!cs_active) { + spi_set_cs(priv, spi, 1); + cs_active = 1; + } + + if (do_write_read(priv, spi, tx, tx_remain, + rx, rx_len)) { + m->status = -EIO; + goto msg_done; + } + + if (t->cs_change) { + spi_set_cs(priv, spi, 0); + cs_active = 0; + } + + m->actual_length += tx_remain + rx_len; + + /* skip next transfer if we coalesced it */ + if (nt) { + t = nt; + break; + } + + i += tx_remain; + } + + if (t->delay_usecs) + udelay(t->delay_usecs); + } + + if (cs_active) + spi_set_cs(priv, spi, 0); + +msg_done: + if (m->complete) + m->complete(m->context); + return m->status; +} + +static int __init orion_tdm_spi_probe(struct platform_device *pdev) +{ + struct spi_master *master; + struct orion_tdm_spi *priv; + struct resource *r; + struct orion_tdm_spi_info *spi_info; + unsigned int tclk_hz; + int status = 0; + u32 val; + + spi_info = pdev->dev.platform_data; + + master = spi_alloc_master(&pdev->dev, sizeof (*priv)); + if (master == NULL) { + dev_dbg(&pdev->dev, "master allocation failed\n"); + return -ENOMEM; + } + + if (pdev->id != -1) + master->bus_num = pdev->id; + + master->setup = orion_tdm_spi_setup; + master->transfer = orion_tdm_spi_transfer; + master->num_chipselect = 2; + master->mode_bits = 0; + + dev_set_drvdata(&pdev->dev, master); + + priv = spi_master_get_devdata(master); + priv->master = master; + priv->spi_info = spi_info; + + priv->clk = clk_get(&pdev->dev, NULL); + if (IS_ERR(priv->clk)) { + dev_err(&pdev->dev, "no associated clk\n"); + status = PTR_ERR(priv->clk); + goto out; + } + + clk_prepare_enable(priv->clk); + tclk_hz = clk_get_rate(priv->clk); + priv->max_speed = DIV_ROUND_UP(tclk_hz, 4); + priv->min_speed = DIV_ROUND_UP(tclk_hz, 254); + priv->current_cs = ~0; + + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (r == NULL) { + status = -ENODEV; + goto out_clk; + } + + if (!request_mem_region(r->start, (r->end - r->start) + 1, + dev_name(&pdev->dev))) { + status = -EBUSY; + goto out_clk; + } + + priv->base = ioremap(r->start, SZ_64K); + + /* configure TDM SPI */ + val = spi_readl(priv, SPI_OUT_EN_CTRL_REG); + val &= ~SPI_OUT_EN_DISABLE_MASK; + spi_writel(priv, val, SPI_OUT_EN_CTRL_REG); + + val = spi_readl(priv, SPI_GLOBAL_CTRL_REG); + val |= CODEC_ENABLE_MASK; + spi_writel(priv, val, SPI_GLOBAL_CTRL_REG); + + status = spi_register_master(master); + if (status < 0) + goto out_rel_mem; + + return status; + +out_rel_mem: + release_mem_region(r->start, (r->end - r->start) + 1); + +out_clk: + clk_disable_unprepare(priv->clk); + clk_put(priv->clk); + +out: + spi_master_put(master); + return status; +} + +static int __exit orion_tdm_spi_remove(struct platform_device *pdev) +{ + struct spi_master *master; + struct orion_tdm_spi *priv; + struct resource *r; + + master = dev_get_drvdata(&pdev->dev); + priv = spi_master_get_devdata(master); + + clk_disable_unprepare(priv->clk); + clk_put(priv->clk); + + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); + release_mem_region(r->start, (r->end - r->start) + 1); + + iounmap(priv->base); + spi_unregister_master(master); + + return 0; +} + +static struct platform_driver orion_tdm_spi_driver = { + .driver = { + .name = DRIVER_NAME, + .owner = THIS_MODULE, + }, + .remove = __exit_p(orion_tdm_spi_remove), +}; + +static int __init orion_tdm_spi_init(void) +{ + return platform_driver_probe(&orion_tdm_spi_driver, + orion_tdm_spi_probe); +} + +module_init(orion_tdm_spi_init); + +static void __exit orion_tdm_spi_exit(void) +{ + platform_driver_unregister(&orion_tdm_spi_driver); +} + +module_exit(orion_tdm_spi_exit); + +MODULE_DESCRIPTION("Orion TDM SPI driver"); +MODULE_AUTHOR("Maxime Bizon "); +MODULE_LICENSE("GPL"); --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/drivers/video/ssd1327.c 2014-04-17 16:28:39.005590852 +0200 @@ -0,0 +1,700 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * commands + */ +#define OPCODE_CONTRAST 0x81 + +#define OPCODE_SET_COLUMN 0x15 +#define OPCODE_SET_ROW 0x75 +#define OPCODE_SET_REMAP 0xa0 +#define OPCODE_DISPLAY_NORMAL 0xa4 +#define OPCODE_DISPLAY_ALL_ON 0xa5 +#define OPCODE_DISPLAY_ALL_OFF 0xa6 + +#define OPCODE_DISPLAY_OFF 0xae +#define OPCODE_DISPLAY_ON 0xaf + +#define OPCODE_DEF_GRAY 0xb9 + +#define SSD1327_MAX_BRIGHTNESS 0x81 +#define SSD1327_NOMINAL_BRIGHTNESS 0x64 + +/* + * fbinfo + */ +static struct fb_fix_screeninfo ssd1327_fb_fix = { + .id = "ssd1327", + .type = FB_TYPE_PACKED_PIXELS, + .visual = FB_VISUAL_STATIC_PSEUDOCOLOR, + .xpanstep = 0, + .ypanstep = 1, + .ywrapstep = 0, + .accel = FB_ACCEL_NONE, +}; + +static struct fb_var_screeninfo ssd1327_fb_var = { + .bits_per_pixel = 8, + .grayscale = 1, + .nonstd = 1, + .red.length = 8, + .green.length = 8, + .blue.length = 8, +}; + +/* + * private data + */ +#define SSD1327_COLS 64 +#define SSD1327_ROWS 128 +#define GDDRAM_SIZE SSD1327_COLS * SSD1327_ROWS + +struct ssd1327 { + struct mutex mutex; + + /* image of display ram */ + u8 gddram[GDDRAM_SIZE]; + u8 old_gddram[GDDRAM_SIZE]; + + /* data ram, 8 bits per pixel */ + u8 *vmem; + unsigned int vmem_size; + + struct fb_info *fb; + struct ssd1327_platform_data *data; + struct spi_device *spi; + + struct backlight_device *backlight; + unsigned int brightness; + + /* watchog timer */ + struct delayed_work wtd_work; + unsigned int wtd_max; + atomic_t wtd_count; +}; + +/* + * send command to device + */ +static int send_cmd(struct ssd1327 *priv, u8 cmd) +{ + struct ssd1327_platform_data *data; + int ret; + + data = priv->spi->dev.platform_data; + + mutex_lock(&priv->mutex); + gpio_set_value(data->data_select_gpio, 0); + ret = spi_write_then_read(priv->spi, &cmd, 1, NULL, 0); + mutex_unlock(&priv->mutex); + return ret; +} + +/* + * send command list to device + */ +static int send_cmds(struct ssd1327 *priv, const u8 *cmd, unsigned int len) +{ + unsigned int i; + int ret; + + for (i = 0; i < len; i++) { + ret = send_cmd(priv, cmd[i]); + if (ret < 0) + return ret; + } + return 0; +} + +/* + * write given data into device gddram + */ +static int write_data(struct ssd1327 *priv, u8 *tx, unsigned int size) +{ + struct ssd1327_platform_data *data; + int ret; + + data = priv->spi->dev.platform_data; + + mutex_lock(&priv->mutex); + gpio_set_value(data->data_select_gpio, 1); + ret = spi_write(priv->spi, tx, size); + mutex_unlock(&priv->mutex); + return ret; +} + +/* + * soft reset & initialize ssd1327 + */ +static int ssd1327_init(struct ssd1327 *priv) +{ + const u8 init_cmds[] = { OPCODE_DISPLAY_ON, + + /* set even/odd splitting */ + OPCODE_SET_REMAP, (1 << 6), + OPCODE_CONTRAST, SSD1327_NOMINAL_BRIGHTNESS, + OPCODE_DEF_GRAY, + OPCODE_DISPLAY_NORMAL, + }; + int ret; + + /* zero ram */ + ret = write_data(priv, priv->gddram, GDDRAM_SIZE); + if (ret) + return ret; + + return send_cmds(priv, init_cmds, sizeof (init_cmds)); +} + +/* + * update area + */ +static int ssd1327_fb_update(struct ssd1327 *priv) +{ + unsigned int col, row, w, h, i, count; + unsigned char *vmem; + u8 *start; + u8 ccmds[3] = { OPCODE_SET_COLUMN, 0, 0x3f }; + u8 rcmds[3] = { OPCODE_SET_ROW, 0, 0x7f }; + int toggle, last_toggle_pos, moved; + + w = priv->data->width; + h = priv->data->height; + + /* backup previous gddram */ + memcpy(priv->old_gddram, priv->gddram, GDDRAM_SIZE); + + vmem = priv->vmem + w * priv->fb->var.yoffset; + + for (row = 0; row < SSD1327_ROWS; row++) { + + if (row >= h) + break; + + for (col = 0; col < SSD1327_COLS; col++) { + unsigned int nibble; + u8 val; + + val = 0; + for (nibble = 0; nibble < 2; nibble++) { + unsigned int off, x; + u8 vval; + + x = col * 2 + nibble; + if (x >= w) + break; + + switch (priv->fb->var.rotate) { + case 0: + default: + off = row * w + x; + break; + + case 180: + off = w * h - (row * w + x) - 1; + break; + + case 90: + off = (w - x - 1) * w + row; + break; + + case 270: + off = x * w + (h - row - 1); + break; + } + + vval = vmem[off] >> 4; + val |= vval << (nibble * 4); + } + + priv->gddram[row * SSD1327_COLS + col] = val; + } + } + + /* count consecutive toggled bytes, each column/row address + * change adds 6 bytes to send */ + moved = toggle = 0; + last_toggle_pos = -INT_MAX; + count = 0; + for (i = 0; i < GDDRAM_SIZE; i++) { + if (priv->gddram[i] ^ priv->old_gddram[i]) { + /* if crossing column boundary and first + * address is not 0, we must send column + * command */ + if (moved && ((i % SSD1327_COLS) == 0)) { + count += 3; + moved = 0; + } + + if (!toggle) { + if (i - last_toggle_pos < 6) { + unsigned int j; + + /* fake last columns as dirty, + * cheaper than repositionning + * cursor */ + for (j = last_toggle_pos; j < i; j++) + priv->old_gddram[j] = + ~priv->gddram[j]; + + count += i - last_toggle_pos - 1; + } else { + /* send command to change + * address & column */ + count += 6; + + /* if we changed first column address + * to non 0, remember it */ + if ((i % SSD1327_COLS)) + moved = 1; + else + moved = 0; + } + } + + toggle = 1; + count++; + + } else { + if (toggle) + last_toggle_pos = i - 1; + toggle = 0; + } + } + + /* force full gddram update if we would send more bytes + * using clever update */ + if (count > GDDRAM_SIZE) + return write_data(priv, priv->gddram, GDDRAM_SIZE); + + moved = toggle = 0; + count = 0; + start = NULL; + for (i = 0; i < GDDRAM_SIZE; i++) { + + if (priv->gddram[i] ^ priv->old_gddram[i]) { + /* if crossed column boundary and first + * address is not 0, we must send command to + * reset column*/ + if (moved && ((i % SSD1327_COLS) == 0)) { + write_data(priv, start, count); + start += count; + count = 0; + ccmds[1] = 0; + send_cmds(priv, ccmds, 3); + moved = 0; + } + + if (!toggle) { + ccmds[1] = i % SSD1327_COLS; + rcmds[1] = i / SSD1327_COLS; + send_cmds(priv, ccmds, 3); + send_cmds(priv, rcmds, 3); + + /* if we changed first column address + * to non 0, remember it */ + if ((i % SSD1327_COLS)) + moved = 1; + else + moved = 0; + start = &priv->gddram[i]; + } + + count++; + toggle = 1; + + } else { + if (count) { + write_data(priv, start, count); + count = 0; + } + toggle = 0; + } + } + + if (count) + write_data(priv, start, count); + + /* reset position */ + ccmds[1] = 0; + send_cmds(priv, ccmds, 3); + rcmds[1] = 0; + send_cmds(priv, rcmds, 3); + return 0; +} + +/* + * frame buffer fill rect callback + */ +static void ssd1327_fb_fillrect(struct fb_info *info, + const struct fb_fillrect *rect) +{ + struct ssd1327 *priv = info->par; + sys_fillrect(info, rect); + atomic_set(&priv->wtd_count, priv->wtd_max); + ssd1327_fb_update(priv); +} + +/* + * frame buffer copy area callback + */ +static void ssd1327_fb_copyarea(struct fb_info *info, + const struct fb_copyarea *area) +{ + struct ssd1327 *priv = info->par; + sys_copyarea(info, area); + atomic_set(&priv->wtd_count, priv->wtd_max); + ssd1327_fb_update(priv); +} + +/* + * frame buffer image blit + */ +static void ssd1327_fb_imageblit(struct fb_info *info, + const struct fb_image *image) +{ + struct ssd1327 *priv = info->par; + sys_imageblit(info, image); + atomic_set(&priv->wtd_count, priv->wtd_max); + ssd1327_fb_update(priv); +} + +/* + * frame buffer pan callback + */ +static int ssd1327_fb_pan(struct fb_var_screeninfo *var, struct fb_info *info) +{ + struct ssd1327 *priv = info->par; + priv->fb->var.xoffset = var->xoffset; + priv->fb->var.yoffset = var->yoffset; + atomic_set(&priv->wtd_count, priv->wtd_max); + ssd1327_fb_update(priv); + return 0; +} + +/* + * fram buffer set_par callback, set videomode + */ +static int ssd1327_fb_set_par(struct fb_info *info) +{ + struct ssd1327 *priv = info->par; + /* called after rotate update */ + atomic_set(&priv->wtd_count, priv->wtd_max); + ssd1327_fb_update(priv); + return 0; +} + +static int ssd1327_fb_check_var(struct fb_var_screeninfo *var, + struct fb_info *info) +{ + unsigned int rotate; + + rotate = var->rotate; + if (rotate != 0 && rotate != 90 && rotate != 180 && rotate != 270) + rotate = 0; + *var = info->var; + var->rotate = rotate; + return 0; +} + +/* + * frame buffer blank callback + */ +static int ssd1327_fb_blank(int blank, struct fb_info *info) +{ + return 0; +} + +/* + * frame buffer write from userspace + */ +static ssize_t ssd1327_fb_write(struct fb_info *info, const char __user *buf, + size_t count, loff_t *ppos) +{ + struct ssd1327 *priv = info->par; + unsigned long p = *ppos; + void *dst; + int err = 0; + unsigned long total_size; + + if (info->state != FBINFO_STATE_RUNNING) + return -EPERM; + + total_size = info->fix.smem_len; + + if (p > total_size) + return -EFBIG; + + if (count > total_size) { + err = -EFBIG; + count = total_size; + } + + if (count + p > total_size) { + if (!err) + err = -ENOSPC; + + count = total_size - p; + } + + dst = (void __force *)(info->screen_base + p); + + if (copy_from_user(dst, buf, count)) + err = -EFAULT; + + if (!err) + *ppos += count; + + atomic_set(&priv->wtd_count, priv->wtd_max); + ssd1327_fb_update(priv); + + return (err) ? err : count; +} + +static struct fb_ops ssd1327_fb_ops = { + .owner = THIS_MODULE, + .fb_write = ssd1327_fb_write, + .fb_fillrect = ssd1327_fb_fillrect, + .fb_copyarea = ssd1327_fb_copyarea, + .fb_imageblit = ssd1327_fb_imageblit, + .fb_pan_display = ssd1327_fb_pan, + .fb_blank = ssd1327_fb_blank, + .fb_check_var = ssd1327_fb_check_var, + .fb_set_par = ssd1327_fb_set_par, +}; + +/* + * watchdog timer + */ +static void wtd_work_cb(struct work_struct *t) +{ + struct ssd1327 *priv; + struct delayed_work *dwork; + + dwork = container_of(t, struct delayed_work, work); + priv = container_of(dwork, struct ssd1327, wtd_work); + + if (atomic_dec_and_test(&priv->wtd_count)) { + dev_err(&priv->spi->dev, "watchdog triggered\n"); + memset(priv->vmem, 0, priv->vmem_size); + ssd1327_fb_update(priv); + } + + schedule_delayed_work(&priv->wtd_work, HZ); +} + +/* + * backlight control + */ +static int ssd1327_bl_update_status(struct backlight_device *bl) +{ + struct ssd1327 *priv; + u8 bl_cmds[4]; + int ret; + + priv = bl_get_data(bl); + + bl_cmds[0] = OPCODE_CONTRAST; + bl_cmds[1] = bl->props.brightness; + + ret = send_cmds(priv, bl_cmds, sizeof (bl_cmds)); + if (ret < 0) + return ret; + priv->brightness = bl->props.brightness; + return 0; +} + +static int ssd1327_bl_get_brightness(struct backlight_device *bl) +{ + struct ssd1327 *priv; + priv = bl_get_data(bl); + return priv->brightness; +} + +static struct backlight_ops ssd1327_bl_ops = { + .update_status = ssd1327_bl_update_status, + .get_brightness = ssd1327_bl_get_brightness, +}; + +static const struct backlight_properties ssd1327_bl_props = { + .power = FB_BLANK_UNBLANK, + .fb_blank = FB_BLANK_UNBLANK, + .max_brightness = SSD1327_MAX_BRIGHTNESS, + .type = BACKLIGHT_RAW, +}; + +static int __devinit init_backlight(struct ssd1327 *priv) +{ + struct backlight_device *bl; + + bl = backlight_device_register("ssd1327", &priv->spi->dev, + priv, &ssd1327_bl_ops, + &ssd1327_bl_props); + if (IS_ERR(bl)) { + dev_err(&priv->spi->dev, "error %ld on backlight register\n", + PTR_ERR(bl)); + return PTR_ERR(bl); + } + priv->backlight = bl; + bl->props.brightness = priv->brightness; + return 0; +} + +/* + * platform device probe callback + */ +static int __devinit ssd1327_probe(struct spi_device *spi) +{ + struct ssd1327 *priv; + struct ssd1327_platform_data *data; + struct fb_info *fb; + int ret; + + data = spi->dev.platform_data; + if (!data) { + dev_err(&spi->dev, "no screen description\n"); + return -ENODEV; + } + + /* sanity check on screen size */ + if (data->width > SSD1327_COLS * 2 || + data->height > SSD1327_ROWS) { + dev_err(&spi->dev, "unsupported screen dimension\n"); + return -ENODEV; + } + + fb = framebuffer_alloc(sizeof (*priv), &spi->dev); + if (!fb) + return -ENOMEM; + priv = fb->par; + mutex_init(&priv->mutex); + priv->spi = spi; + priv->data = data; + priv->fb = fb; + priv->brightness = SSD1327_NOMINAL_BRIGHTNESS; + priv->wtd_max = data->watchdog; + + /* setup framebuffer */ + fb->fbops = &ssd1327_fb_ops; + fb->flags = FBINFO_FLAG_DEFAULT | FBINFO_HWACCEL_YPAN; + fb->var = ssd1327_fb_var; + fb->fix = ssd1327_fb_fix; + + fb->var.xres = data->width; + fb->var.yres = data->height; + fb->var.xres_virtual = data->width; + fb->var.yres_virtual = data->height * 2; + + /* twice lcd size so we can pan in one direction */ + fb->fix.smem_len = (data->width * data->height) * 2; + fb->fix.line_length = data->width; + fb->var.rotate = data->rotate; + + /* allocate video memory */ + priv->vmem_size = PAGE_ALIGN(fb->fix.smem_len); + priv->vmem = vmalloc(priv->vmem_size); + if (!priv->vmem) { + ret = -ENOMEM; + goto fail; + } + memset(priv->vmem, 0, priv->vmem_size); + fb->screen_base = (char __iomem *)priv->vmem; + + ret = ssd1327_init(priv); + if (ret) + goto fail; + + if (init_backlight(priv)) + goto fail; + + /* register frame buffer */ + ret = register_framebuffer(fb); + if (ret < 0) + goto fail; + + INIT_DELAYED_WORK(&priv->wtd_work, wtd_work_cb); + + if (priv->wtd_max) { + atomic_set(&priv->wtd_count, priv->wtd_max); + schedule_delayed_work(&priv->wtd_work, HZ); + } + + dev_info(&spi->dev, + "fb%d: SSD1327 frame buffer device (%ux%u screen)\n", + fb->node, data->width, data->height); + + dev_set_drvdata(&spi->dev, priv); + return 0; + +fail: + if (priv->vmem) + vfree(priv->vmem); + if (priv->backlight) + backlight_device_unregister(priv->backlight); + framebuffer_release(fb); + return ret; +} + +/* + * platform device remove callback + */ +static int __devexit ssd1327_remove(struct spi_device *spi) +{ + struct ssd1327 *priv; + unsigned int i; + + priv = dev_get_drvdata(&spi->dev); + cancel_delayed_work_sync(&priv->wtd_work); + unregister_framebuffer(priv->fb); + for (i = 0; i < priv->vmem_size; i += PAGE_SIZE) { + struct page *page; + page = vmalloc_to_page(priv->vmem + i); + page->mapping = NULL; + } + vfree(priv->vmem); + backlight_device_unregister(priv->backlight); + framebuffer_release(priv->fb); + return 0; +} + +static struct spi_driver ssd1327_driver = { + .driver = { + .name = "ssd1327", + .owner = THIS_MODULE, + }, + .probe = ssd1327_probe, + .remove = __devexit_p(ssd1327_remove), +}; + +static int __init ssd1327_module_init(void) +{ + return spi_register_driver(&ssd1327_driver); +} + +static void __exit ssd1327_module_exit(void) +{ + spi_unregister_driver(&ssd1327_driver); +} + +module_init(ssd1327_module_init); +module_exit(ssd1327_module_exit); + +MODULE_DESCRIPTION("SSD1327 driver"); +MODULE_AUTHOR("Maxime Bizon "); +MODULE_LICENSE("GPL"); --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/include/linux/fbxatm_dev.h 2013-09-03 14:19:33.338105640 +0200 @@ -0,0 +1,434 @@ +#ifndef LINUX_FBXATM_DEV_H_ +#define LINUX_FBXATM_DEV_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * atm cell helper + */ +#define ATM_CELL_HDR_SIZE 5 + +#define ATM_GET_GFC(h) (((h)[0] & 0xf0) >> 4) +#define ATM_SET_GFC(h,v) do { \ + (h)[0] &= ~0xf0; \ + (h)[0] |= (v) << 4; \ + } while (0) + +#define ATM_GET_VPI(h) ((((h)[0] & 0x0f) << 4) | \ + (((h)[1] & 0xf0) >> 4)) +#define ATM_SET_VPI(h,v) do { \ + (h)[0] &= ~0xf; \ + (h)[1] &= ~0xf0; \ + (h)[0] |= (v) >> 4; \ + (h)[1] |= ((v) & 0xf) << 4; \ + } while (0) + +#define ATM_GET_VCI(h) ((((h)[1] & 0x0f) << 12) | \ + ((h)[2] << 4) | \ + ((((h)[3] & 0xf0) >> 4))) +#define ATM_SET_VCI(h,v) do { \ + (h)[1] &= ~0xf; \ + (h)[3] &= ~0xf0; \ + (h)[1] |= (v) >> 12; \ + (h)[2] = ((v) & 0xff0) >> 4; \ + (h)[3] |= ((v) & 0xf) << 4; \ + } while (0) + + +#define ATM_GET_PT(h) (((h)[3] & 0x0e) >> 1) +#define ATM_SET_PT(h,v) do { \ + (h)[3] &= ~0xe; \ + (h)[3] |= (v) << 1; \ + } while (0) + +#define ATM_GET_CLP(h) (((h)[3] & 0x01)) +#define ATM_SET_CLP(h,v) do { \ + (h)[3] &= ~1; \ + (h)[3] |= (v); \ + } while (0) + +#define ATM_GET_HEC(h) ((h)[4]) +#define ATM_SET_HEC(h,v) do { \ + (h)[4] = (v); \ + } while (0) + + +/* + * OAM definition + */ +#define OAM_VCI_SEG_F4 3 +#define OAM_VCI_END2END_F4 4 + +#define OAM_PTI_SEG_F5 0x4 +#define OAM_PTI_END2END_F5 0x5 + +#define OAM_TYPE_SHIFT 4 +#define OAM_TYPE_MASK (0xf << OAM_TYPE_SHIFT) +#define OAM_TYPE_FAULT_MANAGEMENT 0x1 +#define OAM_TYPE_PERF_MANAGEMENT 0x2 +#define OAM_TYPE_ACTIVATION 0x8 + +#define FUNC_TYPE_SHIFT 0 +#define FUNC_TYPE_MASK (0xf << FUNC_TYPE_SHIFT) +#define FUNC_TYPE_AIS 0x0 +#define FUNC_TYPE_FERF 0x1 +#define FUNC_TYPE_CONT_CHECK 0x4 +#define FUNC_TYPE_OAM_LOOPBACK 0x8 + +struct fbxatm_oam_cell_payload { + u8 cell_hdr[5]; + u8 cell_type; + u8 loopback_indication; + u8 correlation_tag[4]; + u8 loopback_id[16]; + u8 source_id[16]; + u8 reserved[8]; + u8 crc10[2]; +}; + +struct fbxatm_oam_cell { + struct fbxatm_oam_cell_payload payload; + struct list_head next; +}; + +struct fbxatm_oam_ping { + struct fbxatm_oam_ping_req req; + u32 correlation_id; + int replied; + wait_queue_head_t wq; + struct list_head next; +}; + +/* + * vcc/device stats + */ +struct fbxatm_vcc_stats { + unsigned long rx_bytes; + unsigned long tx_bytes; + unsigned long rx_aal5; + unsigned long tx_aal5; +}; + +struct fbxatm_dev_stats { + unsigned long rx_bytes; + unsigned long tx_bytes; + unsigned long rx_aal5; + unsigned long tx_aal5; + unsigned long rx_f4_oam; + unsigned long tx_f4_oam; + unsigned long rx_f5_oam; + unsigned long tx_f5_oam; + unsigned long rx_bad_oam; + unsigned long rx_bad_llid_oam; + unsigned long rx_other_oam; + unsigned long rx_dropped; + unsigned long tx_drop_nolink; +}; + +/* + * vcc user ops + */ +struct fbxatm_vcc_uops { + void (*link_change)(void *cb_data, int link, + unsigned int rx_cell_rate, + unsigned int tx_cell_rate); + void (*rx_pkt)(struct sk_buff *skb, void *cb_data); + void (*tx_done)(void *cb_data); +}; + +/* + * vcc status flags + */ +enum { + FBXATM_VCC_F_FULL = (1 << 0), + + FBXATM_VCC_F_LINK_UP = (1 << 1), +}; + + +/* + * vcc definition + */ +struct fbxatm_dev; + +struct fbxatm_vcc { + unsigned int vpi; + unsigned int vci; + + struct fbxatm_vcc_qos qos; + + struct fbxatm_vcc_stats stats; + + enum fbxatm_vcc_user user; + void *user_priv; + + struct fbxatm_dev *adev; + void *dev_priv; + + spinlock_t user_ops_lock; + const struct fbxatm_vcc_uops *user_ops; + void *user_cb_data; + + unsigned int to_drop_pkt; + + spinlock_t tx_lock; + unsigned long vcc_flags; + + struct list_head next; +}; + +/* + * fbxatm device operation + */ +struct fbxatm_dev_ops { + int (*open)(struct fbxatm_vcc *vcc); + + void (*close)(struct fbxatm_vcc *vcc); + + int (*ioctl)(struct fbxatm_dev *adev, + unsigned int cmd, void __user *arg); + + int (*send)(struct fbxatm_vcc *vcc, struct sk_buff *skb); + + int (*send_oam)(struct fbxatm_dev *adev, + struct fbxatm_oam_cell *cell); + + int (*init_procfs)(struct fbxatm_dev *adev); + void (*release_procfs)(struct fbxatm_dev *adev); + + struct module *owner; +}; + +/* + * device flags + */ +enum { + FBXATM_DEV_F_LINK_UP = (1 << 0), +}; + +/* + * fbxatm device definition + */ +struct fbxatm_dev { + int ifindex; + unsigned long dev_flags; + + unsigned int max_vcc; + unsigned int vci_mask; + unsigned int vpi_mask; + unsigned int max_priority; + unsigned int max_rx_priority; + unsigned int tx_headroom; + + char *name; + + /* unit: b/s */ + unsigned int link_rate_ds; + unsigned int link_rate_us; + + unsigned int link_cell_rate_ds; + unsigned int link_cell_rate_us; + + const struct fbxatm_dev_ops *ops; + + spinlock_t stats_lock; + struct fbxatm_dev_stats stats; + + struct list_head vcc_list; + + struct device dev; + + spinlock_t oam_lock; + struct list_head rx_oam_cells; + unsigned int rx_oam_cells_count; + struct work_struct oam_work; + + struct list_head oam_pending_ping; + u32 oam_correlation_id; + + struct proc_dir_entry *dev_proc_entry; + void *priv; + struct list_head next; +}; + +/* + * API for device drivers + */ +struct fbxatm_dev *fbxatm_alloc_device(int sizeof_priv); + +int fbxatm_register_device(struct fbxatm_dev *adev, + const char *base_name, + const struct fbxatm_dev_ops *ops); + +void fbxatm_free_device(struct fbxatm_dev *adev); + +void fbxatm_dev_set_link_up(struct fbxatm_dev *adev); + +void fbxatm_dev_set_link_down(struct fbxatm_dev *adev); + +int fbxatm_unregister_device(struct fbxatm_dev *adev); + +void fbxatm_netifrx_oam(struct fbxatm_dev *adev, + struct fbxatm_oam_cell *cell); + + +static inline int fbxatm_vcc_link_is_up(struct fbxatm_vcc *vcc) +{ + return test_bit(FBXATM_VCC_F_LINK_UP, &vcc->vcc_flags); +} + +#define FBXATMDEV_ALIGN 4 + +static inline void *fbxatm_dev_priv(struct fbxatm_dev *adev) +{ + return (u8 *)adev + ((sizeof(struct fbxatm_dev) + + (FBXATMDEV_ALIGN - 1)) + & ~(FBXATMDEV_ALIGN - 1)); +} + +/* + * API for FBXATM stack user + */ +struct fbxatm_ioctl { + int (*handler)(struct socket *sock, + unsigned int cmd, void __user *useraddr); + + void (*release)(struct socket *sock); + + struct module *owner; + struct list_head next; +}; + +void fbxatm_set_uops(struct fbxatm_vcc *vcc, + const struct fbxatm_vcc_uops *user_ops, + void *user_cb_data); + +struct fbxatm_vcc * +fbxatm_bind_to_vcc(const struct fbxatm_vcc_id *id, + enum fbxatm_vcc_user user); + +void fbxatm_unbind_vcc(struct fbxatm_vcc *vcc); + + +static inline int fbxatm_vcc_queue_full(struct fbxatm_vcc *vcc) +{ + return test_bit(FBXATM_VCC_F_FULL, &vcc->vcc_flags); +} + +#ifdef CONFIG_FBXATM_STACK +/* + * stack user callback to send data on given vcc + */ +static inline int fbxatm_send(struct fbxatm_vcc *vcc, struct sk_buff *skb) +{ + int ret; + unsigned int len; + + len = skb->len; + + spin_lock_bh(&vcc->tx_lock); + if (!test_bit(FBXATM_VCC_F_LINK_UP, &vcc->vcc_flags)) { + spin_unlock_bh(&vcc->tx_lock); + dev_kfree_skb(skb); + spin_lock(&vcc->adev->stats_lock); + vcc->adev->stats.tx_drop_nolink++; + spin_unlock(&vcc->adev->stats_lock); + return 0; + } + + ret = vcc->adev->ops->send(vcc, skb); + if (!ret) { + vcc->stats.tx_bytes += len; + vcc->stats.tx_aal5++; + } + spin_unlock_bh(&vcc->tx_lock); + + if (!ret) { + spin_lock_bh(&vcc->adev->stats_lock); + vcc->adev->stats.tx_bytes += len; + vcc->adev->stats.tx_aal5++; + spin_unlock_bh(&vcc->adev->stats_lock); + } + return ret; +} + +/* + * device callback when packet comes in + */ +static inline void fbxatm_netifrx(struct fbxatm_vcc *vcc, struct sk_buff *skb) +{ + unsigned int len; + + len = skb->len; + + spin_lock_bh(&vcc->user_ops_lock); + if (!vcc->user_ops) { + spin_unlock_bh(&vcc->user_ops_lock); + dev_kfree_skb(skb); + return; + } + + if (vcc->to_drop_pkt) { + vcc->to_drop_pkt--; + spin_unlock_bh(&vcc->user_ops_lock); + dev_kfree_skb(skb); + return; + } + + vcc->stats.rx_bytes += len; + vcc->stats.rx_aal5++; + + vcc->user_ops->rx_pkt(skb, vcc->user_cb_data); + spin_unlock_bh(&vcc->user_ops_lock); + + spin_lock_bh(&vcc->adev->stats_lock); + vcc->adev->stats.rx_bytes += len; + vcc->adev->stats.rx_aal5++; + spin_unlock_bh(&vcc->adev->stats_lock); +} + +/* + * device callback when tx is done on vcc + */ +static inline void fbxatm_tx_done(struct fbxatm_vcc *vcc) +{ + spin_lock_bh(&vcc->user_ops_lock); + if (vcc->user_ops) + vcc->user_ops->tx_done(vcc->user_cb_data); + spin_unlock_bh(&vcc->user_ops_lock); +} +#else +int fbxatm_send(struct fbxatm_vcc *vcc, struct sk_buff *skb); +void fbxatm_netifrx(struct fbxatm_vcc *vcc, struct sk_buff *skb); +void fbxatm_tx_done(struct fbxatm_vcc *vcc); +#endif + +static inline unsigned int fbxatm_rx_reserve(void) +{ +#ifdef CONFIG_FBXATM_STACK + /* normal stack, no headroom needed */ + return 0; +#else + /* remote stub, we need to send rx skb to another location, + * adding the fbxatm_remote header, an ethernet header (with + * possible vlan) */ + return ALIGN(sizeof (struct fbxatm_remote_hdr) + VLAN_ETH_HLEN, 4); +#endif +} + +void fbxatm_register_ioctl(struct fbxatm_ioctl *ioctl); + +void fbxatm_unregister_ioctl(struct fbxatm_ioctl *ioctl); + +#endif /* !LINUX_FBXATM_DEV_H_ */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/include/linux/fbxatm.h 2013-09-03 14:19:33.338105640 +0200 @@ -0,0 +1,158 @@ +/* + * Generic fbxatm definition, exported to userspace + */ +#ifndef LINUX_FBXATM_H_ +#define LINUX_FBXATM_H_ + +#include +#include + +#define FBXATM_IOCTL_MAGIC 0xd3 + +/* allow userspace usage without up to date kernel headers */ +#ifndef PF_FBXATM +#define PF_FBXATM 32 +#define AF_FBXATM PF_FBXATM +#endif + +struct fbxatm_vcc_id { + int dev_idx; + __u32 vpi; + __u32 vci; +}; + +enum fbxatm_vcc_user { + FBXATM_VCC_USER_NONE = 0, + FBXATM_VCC_USER_2684, + FBXATM_VCC_USER_PPPOA, +}; + +enum fbxatm_vcc_traffic_class { + FBXATM_VCC_TC_UBR_NO_PCR = 0, + FBXATM_VCC_TC_UBR, +}; + +struct fbxatm_vcc_qos { + __u32 traffic_class; + __u32 max_sdu; + __u32 max_buffered_pkt; + __u32 priority; + __u32 rx_priority; +}; + + +/* + * VCC related + */ +struct fbxatm_vcc_params { + /* ADD/DEL/GET */ + struct fbxatm_vcc_id id; + + /* ADD/GET */ + struct fbxatm_vcc_qos qos; + + /* GET */ + enum fbxatm_vcc_user user; +}; + +#define FBXATM_IOCADD _IOW(FBXATM_IOCTL_MAGIC, 1, \ + struct fbxatm_vcc_params) + +#define FBXATM_IOCDEL _IOR(FBXATM_IOCTL_MAGIC, 2, \ + struct fbxatm_vcc_params) + +#define FBXATM_IOCGET _IOWR(FBXATM_IOCTL_MAGIC, 3, \ + struct fbxatm_vcc_params) + + +struct fbxatm_vcc_drop_params { + struct fbxatm_vcc_id id; + unsigned int drop_count; +}; + +#define FBXATM_IOCDROP _IOWR(FBXATM_IOCTL_MAGIC, 5, \ + struct fbxatm_vcc_drop_params) + +/* + * OAM related + */ +enum fbxatm_oam_ping_type { + FBXATM_OAM_PING_SEG_F4 = 0, + FBXATM_OAM_PING_SEG_F5, + FBXATM_OAM_PING_E2E_F4, + FBXATM_OAM_PING_E2E_F5, +}; + +struct fbxatm_oam_ping_req { + /* only dev_idx for F4 */ + struct fbxatm_vcc_id id; + + __u8 llid[16]; + enum fbxatm_oam_ping_type type; +}; + +#define FBXATM_IOCOAMPING _IOWR(FBXATM_IOCTL_MAGIC, 10, \ + struct fbxatm_oam_ping_req) + + +/* + * PPPOA related + */ +enum fbxatm_pppoa_encap { + FBXATM_EPPPOA_AUTODETECT = 0, + FBXATM_EPPPOA_VCMUX, + FBXATM_EPPPOA_LLC, +}; + +struct fbxatm_pppoa_vcc_params { + struct fbxatm_vcc_id id; + __u32 encap; + __u32 cur_encap; +}; + +#define FBXATM_PPPOA_IOCADD _IOW(FBXATM_IOCTL_MAGIC, 20, \ + struct fbxatm_pppoa_vcc_params) + +#define FBXATM_PPPOA_IOCDEL _IOW(FBXATM_IOCTL_MAGIC, 21, \ + struct fbxatm_pppoa_vcc_params) + +#define FBXATM_PPPOA_IOCGET _IOWR(FBXATM_IOCTL_MAGIC, 22, \ + struct fbxatm_pppoa_vcc_params) + + + +/* + * 2684 related + */ +enum fbxatm_2684_encap { + FBXATM_E2684_VCMUX = 0, + FBXATM_E2684_LLC, +}; + +enum fbxatm_2684_payload { + FBXATM_P2684_BRIDGE = 0, + FBXATM_P2684_ROUTED, +}; + +#define FBXATM_2684_MAX_VCC 8 + +struct fbxatm_2684_vcc_params { + struct fbxatm_vcc_id id_list[FBXATM_2684_MAX_VCC]; + size_t id_count; + + __u32 encap; + __u32 payload; + char dev_name[IFNAMSIZ]; +}; + + +#define FBXATM_2684_IOCADD _IOW(FBXATM_IOCTL_MAGIC, 30, \ + struct fbxatm_2684_vcc_params) + +#define FBXATM_2684_IOCDEL _IOW(FBXATM_IOCTL_MAGIC, 31, \ + struct fbxatm_2684_vcc_params) + +#define FBXATM_2684_IOCGET _IOWR(FBXATM_IOCTL_MAGIC, 32, \ + struct fbxatm_2684_vcc_params) + +#endif /* LINUX_FBXATM_H_ */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/include/linux/fbxatm_remote.h 2013-09-03 14:19:33.342105717 +0200 @@ -0,0 +1,216 @@ +#ifndef FBXATM_REMOTE_H_ +#define FBXATM_REMOTE_H_ + +#include +#include +#include + +/* + * fbxatm remote protocol messages + */ +#define ETH_P_FBXATM_REMOTE 0x8844 +#define FBXATM_REMOTE_MAGIC 0xd76f8d2f + +enum fbxatm_remote_flags { + FBXATM_RFLAGS_ACK = (1 << 0), +}; + +enum fbxatm_remote_mtype { + /* driver => stub */ + FBXATM_RMT_CONNECT = 0, + + /* stub => driver */ + FBXATM_RMT_DEV_LINK, + FBXATM_RMT_DEV_RX_OAM, + + /* driver => stub */ + FBXATM_RMT_KEEPALIVE, + FBXATM_RMT_DEV_SEND_OAM, + FBXATM_RMT_VCC_ACTION, + + /* driver => stub */ + FBXATM_RMT_VCC_SEND, + + /* stub => driver */ + FBXATM_RMT_VCC_QEMPTY, + FBXATM_RMT_VCC_RX, +}; + +struct fbxatm_remote_hdr { + u32 magic; + u8 flags; + u8 seq; + u16 len; + u16 sport; + u16 dport; + + u32 session_id; + u32 mtype; +}; + +/* + * sent to destination port 0 + */ +struct fbxatm_remote_connect { + u8 name[32]; + + u16 dev_link_port; + u16 dev_rx_oam_port; +}; + +struct fbxatm_remote_connect_ack { + u16 vcc_action_port; + u16 dev_send_oam_port; + u16 keepalive_port; + u16 pad; + + u32 max_vcc; + u32 vci_mask; + u32 vpi_mask; + u32 max_priority; + u32 max_rx_priority; + + u32 link; + u32 link_rate_ds; + u32 link_rate_us; + u32 link_cell_rate_ds; + u32 link_cell_rate_us; +}; + +/* + * sent on dev_link port + */ +struct fbxatm_remote_dev_link { + u32 link; + u32 link_rate_ds; + u32 link_rate_us; + u32 link_cell_rate_ds; + u32 link_cell_rate_us; +}; + +/* + * sent on vcc_action port + */ +struct fbxatm_remote_vcc_action { + /* 1: open - 0: close */ + u32 action; + + /* + * open args + */ + u16 vcc_rx_port; + u16 vcc_qempty_port; + + /* from vcc id struct */ + u32 vpi; + u32 vci; + + /* from qos struct */ + u32 traffic_class; + u32 max_sdu; + u32 max_buffered_pkt; + u32 priority; + u32 rx_priority; + + /* + * close args + */ + u32 vcc_remote_id; +}; + +struct fbxatm_remote_vcc_action_ack { + u32 ret; + + /* open args ack */ + u32 vcc_remote_id; + u16 vcc_send_port; + u16 pad; +}; + +/* + * sent on vcc_send port + */ +struct fbxatm_remote_vcc_send_ack { + u32 full; +}; + +/* + * pseudo socket layer + */ +struct fbxatm_remote_sock; +struct fbxatm_remote_ctx; + +struct fbxatm_remote_sockaddr { + u16 lport; + u16 dport; + u32 mtype; + int infinite_retry; + int (*deliver)(void *priv, struct sk_buff *skb, + struct sk_buff **ack); + void (*response)(void *priv, struct sk_buff *skb); + void *priv; +}; + +struct sk_buff *fbxatm_remote_alloc_skb(struct fbxatm_remote_ctx *ctx, + unsigned int size); + +unsigned int fbxatm_remote_headroom(struct fbxatm_remote_ctx *ctx); + +void fbxatm_remote_sock_getaddr(struct fbxatm_remote_sock *sock, + struct fbxatm_remote_sockaddr *addr); + +void fbxatm_remote_sock_purge(struct fbxatm_remote_sock *sock); + +int fbxatm_remote_sock_pending(struct fbxatm_remote_sock *sock); + +struct fbxatm_remote_ctx *fbxatm_remote_alloc_ctx(struct net_device *netdev, + u8 *remote_mac, + u32 session_id, + void (*timeout)(void *priv), + void *priv); + +struct fbxatm_remote_sock * +fbxatm_remote_sock_bind(struct fbxatm_remote_ctx *ctx, + struct fbxatm_remote_sockaddr *addr, + int send_ack); + +struct fbxatm_remote_sock * +fbxatm_remote_sock_connect(struct fbxatm_remote_ctx *ctx, + struct fbxatm_remote_sockaddr *addr, + int need_ack); + +int fbxatm_remote_sock_send(struct fbxatm_remote_sock *sock, + struct sk_buff *skb); + +int fbxatm_remote_sock_send_ack(struct fbxatm_remote_sock *sock, + struct sk_buff *skb); + +int fbxatm_remote_sock_send_raw_ack(struct fbxatm_remote_ctx *ctx, + struct net_device *dev, + u8 *remote_mac, + struct fbxatm_remote_hdr *hdr, + struct sk_buff *ack); + +void fbxatm_remote_sock_close(struct fbxatm_remote_sock *sock); + +void fbxatm_remote_set_unknown_cb(void (*cb)(struct net_device *, + struct sk_buff *)); + +void fbxatm_remote_free_ctx(struct fbxatm_remote_ctx *ctx); + +void fbxatm_remote_ctx_set_dead(struct fbxatm_remote_ctx *ctx); + +int fbxatm_remote_init(void); + +void fbxatm_remote_exit(void); + +/* + * platform data for fbxatm_remote driver + */ +struct fbxatm_remote_pdata { + u8 remote_mac[ETH_ALEN]; + char netdev_name[IFNAMSIZ]; + char remote_name[32]; +}; + +#endif /* !FBXATM_REMOTE_H_ */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/include/linux/fbxbridge.h 2014-04-17 17:00:38.218938071 +0200 @@ -0,0 +1,205 @@ +#ifndef _FBXBRIDGE_H +# define _FBXBRIDGE_H + +#include +#include + +#define MAX_LAN_DEVICES 4 +#define MAX_ALIASES 3 +#define MAX_SMTP_ALLOWED 3 + +#define FBXBRIDGE_PFX "fbxbridge: " + +#define FBXBRIDGE_LAN_TO_WAN 1 +#define FBXBRIDGE_WAN_TO_LAN 2 + +#define FBXBRIDGE_FLAGS_FILTER (1 << 0) +#define FBXBRIDGE_FLAGS_DHCP_PROXY (1 << 1) +#define FBXBRIDGE_FLAGS_DHCPD (1 << 2) +#define FBXBRIDGE_FLAGS_QOS (1 << 3) +#define FBXBRIDGE_FLAGS_FORBID_INTERACTIVE (1 << 4) +#define FBXBRIDGE_FLAGS_BLOCK_SMTP (1 << 5) +#define FBXBRIDGE_FLAGS_NETFILTER (1 << 6) + +/* + * ioctl command + */ + +enum fbxbridge_ioctl_cmd +{ + E_CMD_BR_CHG = 0, + E_CMD_BR_DEV_CHG, + E_CMD_BR_PARAMS, +}; + +struct fbxbridge_ioctl_chg +{ + char brname[IFNAMSIZ]; + int action; +}; + +struct fbxbridge_ioctl_dev_chg +{ + char brname[IFNAMSIZ]; + char devname[IFNAMSIZ]; + int wan; + int action; +}; + +struct fbxbridge_dev_info +{ + char name[IFNAMSIZ]; + int active; + int present; +}; + +struct fbxbridge_ioctl_params +{ + int action; + char brname[IFNAMSIZ]; + struct fbxbridge_dev_info devs[MAX_LAN_DEVICES + 1]; + unsigned int flags; + unsigned int tcp_mss_value; + unsigned int fwmark; + unsigned int stopmark; + unsigned char lan_hwaddr[ETH_ALEN]; + unsigned char have_hw_addr; + unsigned int dns1_addr; + unsigned int dns2_addr; + unsigned long ip_aliases[MAX_ALIASES]; + unsigned long smtp_allowed[MAX_SMTP_ALLOWED]; + unsigned long smtp_mask_allowed[MAX_SMTP_ALLOWED]; + + unsigned long dhcpd_renew_time; + unsigned long dhcpd_rebind_time; + unsigned long dhcpd_lease_time; + unsigned int inputmark; +}; + +struct fbxbridge_ioctl_req +{ + enum fbxbridge_ioctl_cmd cmd; + unsigned long arg; +}; + +#ifdef __KERNEL__ + +#include +#include +#include +#include + +#define ARP_RATE_LIMIT (HZ) +#define ARP_ETHER_SIZE (8 + ETH_ALEN * 2 + 4 * 2) + +struct fbxbridge; + +struct fbxbridge +{ + struct fbxbridge *next; + unsigned int refcount; + + char name[IFNAMSIZ]; + struct net_device *dev; + + /* local and remote (fbx) ip address */ + unsigned long br_ipaddr; + unsigned long br_remote_ipaddr; + + /* list of ip we consider to be local */ + unsigned long ip_aliases[MAX_ALIASES]; + + /* list of server for which we forward tcp port 25 */ + unsigned long smtp_allowed[MAX_SMTP_ALLOWED]; + unsigned long smtp_mask_allowed[MAX_SMTP_ALLOWED]; + + /* wan side inet info */ + unsigned long wan_ipaddr; + unsigned long wan_netmask; + /* this is the _client_ gw */ + unsigned long wan_gw; + + char devs_names[MAX_LAN_DEVICES + 1][IFNAMSIZ]; + struct net_device *devs[MAX_LAN_DEVICES + 1]; + int devs_mask; + struct net_device *active_lan_dev; + + unsigned char lan_hwaddr[ETH_ALEN]; + unsigned char have_hw_addr; + + unsigned int flags; + unsigned int tcp_mss_value; + unsigned int fwmark; + unsigned int stopmark; + unsigned int inputmark; + + unsigned int dns1_ipaddr; + unsigned int dns2_ipaddr; + + unsigned char dhcp_hwaddr[ETH_ALEN]; + unsigned int dhcp_use_bcast; + unsigned long last_arp_send; + + unsigned long dhcpd_renew_time; + unsigned long dhcpd_rebind_time; + unsigned long dhcpd_lease_time; +}; + +/* fbxbridge_dev.c */ +void keep_hw_addr(struct fbxbridge *br, unsigned char *hwaddr); + +/* fbxbridge_dhcp.c */ +int fbxbridge_dhcp_proxy(struct fbxbridge *br, struct sk_buff *skb, + unsigned direction); + +int fbxbridge_dhcpd(struct fbxbridge *br, struct sk_buff *skb); + + +/* fbxbridge_forward.c */ +struct sk_buff *fbxbridge_handle_frame(struct fbxbridge *br, + struct sk_buff *skb); + + +/* fbxbridge_filter.c */ +int fbxbridge_check_ip_packet(struct fbxbridge *br, struct sk_buff *skb, + unsigned direction); + +int fbxbridge_nf_hook(struct fbxbridge *br, uint8_t pf, unsigned int hook, + struct sk_buff *skb, struct net_device *in, + struct net_device *out); + +/* fbxbridge_local.c */ +void +handle_local_input_wan_frame(struct fbxbridge *br, struct sk_buff *skb); + +void +handle_local_input_lan_frame(struct fbxbridge *br, struct sk_buff *skb); + +void +handle_local_output_frame(struct fbxbridge *br, struct sk_buff *skb); + + +/* fbxbridge_output.c */ +void output_arp_frame(struct fbxbridge *br, struct net_device *dev, + unsigned short type, + unsigned long src_ip, unsigned char *src_hw, + unsigned long target_ip, unsigned char *target_hw); + +void output_lan_frame(struct fbxbridge *br, struct sk_buff *skb); + +void output_lan_mcast_frame(struct fbxbridge *br, struct sk_buff *skb); + +void output_wan_frame(struct fbxbridge *br, struct sk_buff *skb); + + +/* fbxbridge_utils.c */ +void fbxbridge_snat_packet(struct sk_buff *skb, unsigned long new_addr); + +void fbxbridge_dnat_packet(struct sk_buff *skb, unsigned long new_addr); + +void +fbxbridge_tcp_mss_adjust(struct sk_buff **skb, unsigned int mss_value); + +#endif /* ! __KERNEL__ */ + +#endif --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/include/linux/fbxgpio_core.h 2013-09-03 14:19:33.342105717 +0200 @@ -0,0 +1,39 @@ +/* + * fbxgpio.h for linux-freebox + * Created by on Wed Feb 21 22:09:46 2007 + * Freebox SA + */ + +#ifndef FBXGPIO_H +# define FBXGPIO_H + +# include + +/* can change pin direction */ +#define FBXGPIO_PIN_DIR_RW (1 << 0) +#define FBXGPIO_PIN_REVERSE_POL (1 << 1) + +struct fbxgpio_operations { + int (*get_datain)(int gpio); + void (*set_dataout)(int gpio, int val); + int (*get_dataout)(int gpio); + void (*set_direction)(int gpio, int dir); + int (*get_direction)(int gpio); +}; + + +struct fbxgpio_pin { + const struct fbxgpio_operations *ops; + const char *pin_name; + uint32_t flags; + int direction; + int pin_num; + unsigned int cur_dataout; + struct device *dev; +}; + + +#define GPIO_DIR_IN 0x1 +#define GPIO_DIR_OUT 0x0 + +#endif /* !FBXGPIO_H */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/include/linux/fbxjtag.h 2013-09-03 14:19:33.342105717 +0200 @@ -0,0 +1,88 @@ +#ifndef FBXJTAG_H_ +# define FBXJTAG_H_ + +#ifdef __KERNEL__ +# include +#endif + +# define JTAG_RESET_STEPS 16 +# define JTAG_DATA_READ_SIZE 128 +# define JTAG_INST_READ_SIZE 128 +# define JTAG_DEF_CLOCK_DELAY 500 +# define JTAG_DEF_WAIT_TMS 0 + +enum jtag_main_state { + JTAG_STATE_TEST_MASK = 0x10, + JTAG_STATE_RUN_MASK = 0x20, + JTAG_STATE_DR_MASK = 0x40, + JTAG_STATE_IR_MASK = 0x80, +}; +#define JTAG_STATE_MASK 0xF0 + +enum jtag_sub_state { + JTAG_SUB_STATE_SELECT = 0x0, + JTAG_SUB_STATE_CAPTURE = 0x1, + JTAG_SUB_STATE_SHIFT = 0x2, + JTAG_SUB_STATE_EXIT1 = 0x3, + JTAG_SUB_STATE_PAUSE = 0x4, + JTAG_SUB_STATE_EXIT2 = 0x5, + JTAG_SUB_STATE_UPDATE = 0x6, +}; +#define JTAG_SUB_STATE_MASK 0xF + +enum jtag_state { + JTAG_STATE_UNDEF = 0, + JTAG_STATE_TEST_LOGIC_RESET = JTAG_STATE_TEST_MASK, + JTAG_STATE_RUN_TEST_IDLE = JTAG_STATE_RUN_MASK, + + JTAG_STATE_SELECT_DR = JTAG_STATE_DR_MASK | JTAG_SUB_STATE_SELECT, + JTAG_STATE_CAPTURE_DR = JTAG_STATE_DR_MASK | JTAG_SUB_STATE_CAPTURE, + JTAG_STATE_SHIFT_DR = JTAG_STATE_DR_MASK | JTAG_SUB_STATE_SHIFT, + JTAG_STATE_EXIT1_DR = JTAG_STATE_DR_MASK | JTAG_SUB_STATE_EXIT1, + JTAG_STATE_PAUSE_DR = JTAG_STATE_DR_MASK | JTAG_SUB_STATE_PAUSE, + JTAG_STATE_EXIT2_DR = JTAG_STATE_DR_MASK | JTAG_SUB_STATE_EXIT2, + JTAG_STATE_UPDATE_DR = JTAG_STATE_DR_MASK | JTAG_SUB_STATE_UPDATE, + + JTAG_STATE_SELECT_IR = JTAG_STATE_IR_MASK | JTAG_SUB_STATE_SELECT, + JTAG_STATE_CAPTURE_IR = JTAG_STATE_IR_MASK | JTAG_SUB_STATE_CAPTURE, + JTAG_STATE_SHIFT_IR = JTAG_STATE_IR_MASK | JTAG_SUB_STATE_SHIFT, + JTAG_STATE_EXIT1_IR = JTAG_STATE_IR_MASK | JTAG_SUB_STATE_EXIT1, + JTAG_STATE_PAUSE_IR = JTAG_STATE_IR_MASK | JTAG_SUB_STATE_PAUSE, + JTAG_STATE_EXIT2_IR = JTAG_STATE_IR_MASK | JTAG_SUB_STATE_EXIT2, + JTAG_STATE_UPDATE_IR = JTAG_STATE_IR_MASK | JTAG_SUB_STATE_UPDATE, + + JTAG_STATE_MAX +}; + +#define JTAG_STATE_IN_DR(state) ((state) & JTAG_STATE_DR_MASK) +#define JTAG_STATE_IN_IR(state) ((state) & JTAG_STATE_IR_MASK) + +#ifdef __KERNEL__ + +#define JTAG_BUF_SIZE 2048 + +struct fbxjtag_data { + const char *name; + struct { + struct fbxgpio_pin *tck; + struct fbxgpio_pin *tms; + struct fbxgpio_pin *tdi; + struct fbxgpio_pin *tdo; + } gpios; + unsigned long clock_delay; + unsigned long wait_tms; + unsigned long data_read_size; + unsigned long instruction_read_size; + struct device *dev; + enum jtag_state state; + char nb_reset; + char dr_buf[JTAG_BUF_SIZE]; + unsigned dr_w; + unsigned dr_r; + char ir_buf[JTAG_BUF_SIZE]; + unsigned ir_r; + unsigned ir_w; +}; +#endif + +#endif /* !FBXJTAG_H_ */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/include/linux/fbxmtd_map_ioctl.h 2013-09-03 14:19:33.342105717 +0200 @@ -0,0 +1,52 @@ +/* + * fbxmtd_map_ioctl.h for linux-freebox + * Created by on Thu Feb 8 20:37:28 2007 + * Freebox SA + */ + +#ifndef FBXMTD_MAP_IOCTL_H +# define FBXMTD_MAP_IOCTL_H + +/* + * IOCTL interface + */ +#define FBXMTD_MINOR 242 + +#define FBXMTD_MAP_IOCTL_MAX_DEV 2 +#define FBXMTD_MAP_IOCTL_MAX_PART 16 + +struct fbxmtd_map_ioctl_part +{ + char name[32]; + uint32_t offset; + uint32_t size; + uint32_t flags; +}; + +struct fbxmtd_map_ioctl_dev +{ + char name[32]; + uint32_t base_phys; + int bus_width; + uint32_t size; + uint32_t status; + struct fbxmtd_map_ioctl_part parts[FBXMTD_MAP_IOCTL_MAX_PART]; + int num_parts; +}; + +#define FBXMTD_MAP_IOCTL_NR 0x42 + +struct fbxmtd_map_ioctl_query +{ + uint32_t cmd; + uint32_t param; + int result; + void __user *user_buf; + uint32_t user_buf_size; +}; + +#define FBXMTDCTL_CMD_GET_DEVICES 0x1 +#define FBXMTDCTL_CMD_ADD_DEVICE 0x2 +#define FBXMTDCTL_CMD_DEL_DEVICE 0x3 + +#endif /* !FBXMTD_MAP_IOCTL_H */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/include/linux/fbxprocfs.h 2014-04-17 16:28:42.469657578 +0200 @@ -0,0 +1,45 @@ +#ifndef FBXPROCFS_H_ +#define FBXPROCFS_H_ + +#include +#include + +struct fbxprocfs_client +{ + const char *dirname; + struct module *owner; + struct proc_dir_entry *dir; + atomic_t refcount; + struct list_head list; +}; + +struct fbxprocfs_ro_desc { + char *name; + unsigned long id; + int (*rfunc)(char *, char **, off_t, int, int *, void *); +}; + +struct fbxprocfs_rw_desc { + char *name; + unsigned long id; + int (*rfunc)(char *, char **, off_t, int, int *, void *); + int (*wfunc)(struct file *, const char *, unsigned long, void *); +}; + +struct fbxprocfs_client *fbxprocfs_add_client(const char *dirname, + struct module *owner); + +int fbxprocfs_remove_client(struct fbxprocfs_client *client); + + +int +fbxprocfs_create_entries(struct fbxprocfs_client *client, + const struct fbxprocfs_ro_desc *ro_desc, + const struct fbxprocfs_rw_desc *rw_desc); + +int +fbxprocfs_remove_entries(struct fbxprocfs_client *client, + const struct fbxprocfs_ro_desc *ro_desc, + const struct fbxprocfs_rw_desc *rw_desc); + +#endif /* FBXPROCFS_H_ */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/include/linux/fbxserial.h 2013-09-03 14:19:33.342105717 +0200 @@ -0,0 +1,122 @@ +#ifndef FBXSERIAL_H_ +#define FBXSERIAL_H_ + +#include +#include + +/* + * some part of serial may vary, we use abstract struct to store this, + * data content depends on type. + */ +#define EXTINFO_SIZE 128 +#define EXTINFO_MAX_COUNT 16 + +/* + * extdev desc + */ +#define EXTINFO_TYPE_EXTDEV 1 + +#define EXTDEV_TYPE_BUNDLE 1 +#define EXTDEV_TYPE_MAX 2 + +struct fbx_serial_extinfo { + u32 type; + + union { + /* extdev */ + struct { + u32 type; + u32 model; + char serial[64]; + } extdev; + + /* raw access */ + unsigned char data[EXTINFO_SIZE]; + } u; +} __attribute__ ((packed));; + + +/* + * master serial structure + */ + +#define FBXSERIAL_VERSION 1 + +#define FBXSERIAL_MAGIC 0x2d9521ab + +#define MAC_ADDR_SIZE 6 +#define RANDOM_DATA_SIZE 32 + +/* + * this is the maximum size we accept to check crc32 against, so + * structure may no grow larger than this + */ +#define FBXSERIAL_MAX_SIZE 8192 + +struct fbx_serial { + u32 crc32; + u32 magic; + u32 struct_version; + u32 len; + + /* board serial */ + u16 type; + u8 version; + u8 manufacturer; + u16 year; + u8 week; + u32 number; + u32 flags; + + /* mac address base */ + u8 mac_addr_base[MAC_ADDR_SIZE]; + + /* mac address count */ + u8 mac_count; + + /* random data */ + u8 random_data[RANDOM_DATA_SIZE]; + + /* last update of data (seconds since epoch) */ + u32 last_modified; + + /* count of following extinfo tag */ + u32 extinfo_count; + + /* beginning of extended info */ + struct fbx_serial_extinfo extinfos[EXTINFO_MAX_COUNT]; + +} __attribute__ ((packed)); + + +/* + * default value to use in case magic is wrong (no cksum in that case) + */ +static inline void fbxserial_set_default(struct fbx_serial *s) +{ + memset(s, 0, sizeof (*s)); + s->magic = FBXSERIAL_MAGIC; + s->struct_version = FBXSERIAL_VERSION; + s->len = sizeof (*s); + s->manufacturer = '_'; + memcpy(s->mac_addr_base, "\x00\x07\xCB\x00\x00\xFD", 6); + s->mac_count = 1; +} + +void +fbxserialinfo_get_random(unsigned char *data, unsigned int len); + +void +fbxserialinfo_get_mac_addr(unsigned char *data); + +int +fbxserialinfo_read(void *data, struct fbx_serial *out); + +struct fbx_serial *fbxserialinfo_get(void); + +/* + * implemented in board specific code + */ +const struct fbx_serial *arch_get_fbxserial(void); + +#endif /* FBXSERIAL_H_ */ diff -Nruw linux-3.6.7-fbx/include/linux/hdmi-cec./dev.h linux-3.6.7-fbx/include/linux/hdmi-cec/dev.h --- linux-3.6.7-fbx/include/linux/hdmi-cec./dev.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/hdmi-cec/dev.h 2013-09-03 14:19:33.342105717 +0200 @@ -0,0 +1,30 @@ +#ifndef __HDMI_CEC_DEV_H +#define __HDMI_CEC_DEV_H + +#include +#include + +#define CEC_IOCTL_BASE 'C' + +#define CEC_SET_LOGICAL_ADDRESS _IOW(CEC_IOCTL_BASE, 0, int) +#define CEC_RESET_DEVICE _IOW(CEC_IOCTL_BASE, 3, int) +#define CEC_GET_COUNTERS _IOR(CEC_IOCTL_BASE, 4, struct cec_counters) +#define CEC_SET_RX_MODE _IOW(CEC_IOCTL_BASE, 5, enum cec_rx_mode) +#define CEC_GET_TX_STATUS _IOW(CEC_IOCTL_BASE, 6, struct cec_tx_status) +#define CEC_SET_DETACHED_CONFIG _IOW(CEC_IOCTL_BASE, 7, struct cec_detached_config) + +#define CEC_MAX_DEVS (10) + +#ifdef __KERNEL__ + +struct cec_adapter; + +int __init cec_cdev_init(void); +void __exit cec_cdev_exit(void); + +int cec_create_adapter_node(struct cec_adapter *); +void cec_remove_adapter_node(struct cec_adapter *); + +#endif /* __KERNEL__ */ + +#endif /* __HDMI_CEC_DEV_H */ diff -Nruw linux-3.6.7-fbx/include/linux/hdmi-cec./hdmi-cec.h linux-3.6.7-fbx/include/linux/hdmi-cec/hdmi-cec.h --- linux-3.6.7-fbx/include/linux/hdmi-cec./hdmi-cec.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/hdmi-cec/hdmi-cec.h 2014-04-17 16:28:42.485657886 +0200 @@ -0,0 +1,275 @@ +/* + * Header for the HDMI CEC core infrastructure + */ +#ifndef __HDMI_CEC_H +#define __HDMI_CEC_H + +#include +#include + +/* Common defines for HDMI CEC */ +#define CEC_BCAST_ADDR (0x0f) +#define CEC_ADDR_MAX CEC_BCAST_ADDR + +#define CEC_MAX_MSG_LEN (16) /* 16 blocks */ + +enum cec_rx_msg_flags { + /* + * an ACK was received for this message + */ + CEC_RX_F_ACKED = (1 << 0), + + /* + * message was fully received + */ + CEC_RX_F_COMPLETE = (1 << 1), +}; + +/** + * struct cec_rx_msg - user-space exposed cec message cookie + * @data: cec message payload + * @len: cec message length + * @valid: 0 for invalid message + * @flags: flag field (cec_rx_msg_flags) + */ +struct cec_rx_msg { + __u8 data[CEC_MAX_MSG_LEN]; + __u8 len; + __u8 valid; + __u8 flags; + +} __attribute__((packed)); + +enum cec_tx_status_flags { + /* + * message was nacked at some point + */ + CEC_TX_F_NACK = (1 << 0), + + /* + * abort sending because total time to send was elapsed + */ + CEC_TX_F_TIMEOUT = (1 << 1), + + /* + * abort sending because maximum number of retry has passed + */ + CEC_TX_F_MAX_RETRIES = (1 << 2), + + /* + * abort sending because of arbitration loss + */ + CEC_TX_F_ARBITRATION_LOST = (1 << 3), + + /* + * message failed for other reason + */ + CEC_TX_F_UNKNOWN_ERROR = (1 << 7), +}; + +/** + * struct cec_tx_msg - user-space exposed cec message cookie + * @expire_ms: how long we try to send message (milliseconds) + * @data: cec message payload + * @len: cec message length + * @success: 0 => message was sent, else => failed to send message + * @flags: flag field (cec_tx_msg_flags) + * @tries: number of try done to send message + */ +struct cec_tx_msg { + __u16 expire_ms; + __u8 data[CEC_MAX_MSG_LEN]; + __u8 len; + __u8 success; + __u8 flags; + __u8 tries; +} __attribute__((packed)); + +struct cec_tx_status { + __u8 sent; + __u8 success; + __u8 flags; + __u8 tries; +} __attribute__((packed)); + +#define DETACH_CFG_F_WAKEUP (1 << 0) + +struct cec_detached_config { + __u8 phys_addr_valid; + __u8 phys_addr[2]; + __u8 flags; +} __attribute__((packed)); + +/* Counters */ + +/** + * struct cec_rx_counters - cec adpater RX counters + */ +struct cec_rx_counters { + __u8 pkts; + __u8 filtered_pkts; + __u8 valid_pkts; + __u8 rx_queue_full; + __u8 late_ack; + __u8 error; + __u8 rx_timeout_abort; + __u8 rx_throttled; +}; + +/** + * struct cec_tx_counters - cec adapter TX counters + */ +struct cec_tx_counters { + __u8 done; + __u8 fail; + __u8 timeout; + __u8 arb_loss; + __u8 bad_ack_timings; + __u8 tx_miss_early; + __u8 tx_miss_late; +}; + +/** + * struct cec_counters - tx and rx cec counters + * @rx: struct cec_rx_counters + * @tx: struct cec_tx_counters + */ +struct cec_counters { + struct cec_rx_counters rx; + struct cec_tx_counters tx; +}; + +/** + * enum cec_rx_mode - cec adapter rx mode + * @CEC_RX_MODE_DISABLED: RX path is disabled (default) + * @CEC_RX_MODE_DEFAULT: accept only unicast traffic + * @CEC_RX_MODE_ACCEPT_ALL: accept all incoming RX traffic (sniffing mode) + * @CEC_RX_MODE_MAX: sentinel + */ +enum cec_rx_mode { + CEC_RX_MODE_DISABLED = 0, + CEC_RX_MODE_DEFAULT, + CEC_RX_MODE_ACCEPT_ALL, + CEC_RX_MODE_MAX +}; + +#ifdef __KERNEL__ + +#include +#include +#include +#include +#include +#include +#include +#include + +struct cec_adapter; + +#define CEC_HW_HAS_COUNTERS (1 << 0) /* HW counts events */ +#define CEC_HW_HAS_RX_FILTER (1 << 1) /* HW has receive filter */ + +/** + * struct cec_adapter_ops - cec adapter low-level operations + * @set_logical_address: callback to set the logical address + * @send: callback to send a cec payload + * @reset: callback to reset the hardware + * @get_counters: callback to get the counters (if supported by HW) + * @set_rx_mode: callback to set the receive mode + * @attach: callback to attach the host to the device + * @detach: callbackt to detach the host from the device + * @set_detached_config: callback to configure adapter when detached + */ +struct cec_adapter_ops { + int (*set_logical_address)(struct cec_adapter *, const u8); + int (*send)(struct cec_adapter *, u16, const u8 *, const u8); + int (*reset)(struct cec_adapter *); + int (*get_counters)(struct cec_adapter *, struct cec_counters *); + int (*set_rx_mode)(struct cec_adapter *, enum cec_rx_mode); + int (*attach)(struct cec_adapter *); + int (*detach)(struct cec_adapter *); + int (*set_detached_config)(struct cec_adapter *, + const struct cec_detached_config *); +}; + +/** + * struct cec_adapter - cec adapter structure + * @driver_name: driver prefix used for device naming + * @module: module pointer for refcounting + * @ops: struct cec_adapter_ops pointer + * @flags: adapter flags bitmask + * @name: adapter unique name + * @dev: device structure for device/driver model interaction + * @lock: adapter all-purpose mutex for exclusive locking + * @attached: adapter attached to host or not + * @tx_pending: true if tx is ongoing + * @tx_lock: transmit lock + * @rx_msg_list: receive message list head + * @rx_msg_list_lock: receive message list lock + * @rx_msg_len: receive message queue len + * @wait: receive waitqueue (used for poll, read) + * @cdev: character device node + */ +struct cec_adapter { + const char *driver_name; + struct module *module; + const struct cec_adapter_ops *ops; + unsigned int flags; + atomic_t users; + + /* unique device name, used for sysfs & chardev */ + char name[128]; + + /* associated sysfs device */ + struct device dev; + + /* private */ + struct mutex lock; + bool attached; + + wait_queue_head_t wait; + + /* transmit message list */ + unsigned long tx_pending; + bool last_tx_success; + u8 last_tx_flags; + u8 last_tx_tries; + struct timer_list tx_timeout_timer; + + /* receive message list */ + struct list_head rx_msg_list; + spinlock_t rx_msg_list_lock; + unsigned int rx_msg_len; + + /* associated chardev */ + struct cdev cdev; + + /* true when unregistering device */ + bool dead; +}; + +#define CECDEV_PRIV_ALIGN 8 + +static inline void *cec_adapter_priv(struct cec_adapter *adapter) +{ + return (u8 *)adapter + ((sizeof(struct cec_adapter) + + (CECDEV_PRIV_ALIGN - 1)) + & ~(CECDEV_PRIV_ALIGN - 1)); +} + +static inline struct cec_adapter *to_cec_adapter(struct device *d) +{ + return container_of(d, struct cec_adapter, dev); +} + +struct cec_adapter *alloc_cec_adapter(size_t priv_size); +int register_cec_adapter(struct cec_adapter *); +void unregister_cec_adapter(struct cec_adapter *); +void free_cec_adapter(struct cec_adapter *); +int adapter_rx_done(struct cec_adapter *, const u8 *, const u8 len, + bool valid, u8 flags); +void adapter_tx_done(struct cec_adapter *, bool success, u8 flags, u8 tries); + +#endif /* __KERNEL__ */ + +#endif /* __HDMI_CEC_H */ diff -Nruw linux-3.6.7-fbx/include/linux/hdmi-cec./Kbuild linux-3.6.7-fbx/include/linux/hdmi-cec/Kbuild --- linux-3.6.7-fbx/include/linux/hdmi-cec./Kbuild 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/hdmi-cec/Kbuild 2014-04-17 16:28:42.485657886 +0200 @@ -0,0 +1 @@ +header-y += hdmi-cec.h dev.h diff -Nruw linux-3.6.7-fbx/include/linux/remoti./Kbuild linux-3.6.7-fbx/include/linux/remoti/Kbuild --- linux-3.6.7-fbx/include/linux/remoti./Kbuild 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/remoti/Kbuild 2014-04-17 16:28:42.789663742 +0200 @@ -0,0 +1 @@ +header-y += remoti.h diff -Nruw linux-3.6.7-fbx/include/linux/remoti./remoti.h linux-3.6.7-fbx/include/linux/remoti/remoti.h --- linux-3.6.7-fbx/include/linux/remoti./remoti.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/include/linux/remoti/remoti.h 2014-04-17 16:28:42.789663742 +0200 @@ -0,0 +1,196 @@ +#ifndef __REMOTI_H +#define __REMOTI_H + +#include +#include + +/* + * subsystem definitions + */ +#define NPI_SYS_RES0 0 +#define NPI_SYS_SYS 1 +#define NPI_SYS_MAC 2 +#define NPI_SYS_NWK 3 +#define NPI_SYS_AF 4 +#define NPI_SYS_ZDO 5 +#define NPI_SYS_SAPI 6 +#define NPI_SYS_UTIL 7 +#define NPI_SYS_DBG 8 +#define NPI_SYS_APP 9 +#define NPI_SYS_RCAF 10 +#define NPI_SYS_RCN 11 +#define NPI_SYS_RCN_CLI 12 +#define NPI_SYS_BOOT 13 +#define NPI_SYS_MAX 14 +#define NPI_SYS_MASK 0x1F + +/* + * type definitions + */ +#define NPI_POLL 0 +#define NPI_SREQ 1 +#define NPI_AREQ 2 +#define NPI_SRSP 3 +#define NPI_TYPE_MAX 4 +#define NPI_TYPE_MASK 3 +#define NPI_TYPE_SHIFT 5 + + +/* common error codes (see RemoTI API) */ +#define RTI_SUCCESS 0x00 + +/* + * rti user message + */ +#define NPI_MAX_DATA_LEN 123 + +struct rti_msg { + __u8 type; + __u8 subsys; + __u8 cmd; + + __u8 data_len; + __u8 data[NPI_MAX_DATA_LEN]; + + __u8 custom_reply_cmd; + __u8 reply_cmd; + __u8 reply_len; + __u8 reply[NPI_MAX_DATA_LEN]; +}; + +/* + * socket addr family on "user" device + */ +#ifndef PF_REMOTI +#define PF_REMOTI 37 +#define AF_REMOTI PF_REMOTI +#endif + +struct sockaddr_rti { + __u32 device_id; +}; + +#define SOL_REMOTI 280 +#define REMOTI_REGISTER_CB 0 + +struct rti_callback { + __u8 subsys; + __u8 cmd; +}; + +/* + * ioctl on uart device + */ +enum rti_dev_state { + RTI_DEV_S_STOPPED = 0, + RTI_DEV_S_BOOTING, + RTI_DEV_S_BOOT_FAILED, + RTI_DEV_S_OPERATIONAL, + RTI_DEV_S_STOPPING, + RTI_DEV_S_DEAD, +}; + +struct rti_dev_status { + __u32 dev_state; + __u32 fw_version; +}; + +struct rti_dev_stats { + __u64 tx_bytes; + __u64 tx_packets; + + __u64 tx_boot_packets; + __u64 tx_rcaf_packets; + __u64 tx_util_packets; + __u64 tx_other_packets; + + + __u64 rx_bytes; + __u64 rx_packets; + __u64 rx_bad_sof; + __u64 rx_len_errors; + __u64 rx_fcs_errors; + __u64 rx_tty_errors; + __u64 rx_full_errors; + __u64 rx_subsys_errors; + __u64 rx_type_errors; + __u64 rx_no_callback; + + __u64 rx_boot_packets; + __u64 rx_rcaf_packets; + __u64 rx_util_packets; + __u64 rx_other_packets; +}; + +enum { + RTI_BOOT_FLAGS_FORCE_UPDATE = (1 << 0), +}; + +#define RTI_IOCTL_MAGIC 0xd4 +#define RTI_ATTACH_DEVICE _IOR(RTI_IOCTL_MAGIC, 1, __u32) +#define RTI_GET_STATUS _IOW(RTI_IOCTL_MAGIC, 2, struct rti_dev_status) +#define RTI_GET_STATS _IOW(RTI_IOCTL_MAGIC, 3, struct rti_dev_stats) + +#define RTI_START_DEVICE _IOR(RTI_IOCTL_MAGIC, 8, __u32) +#define RTI_STOP_DEVICE _IO(RTI_IOCTL_MAGIC, 9) + + +#ifdef __KERNEL__ + +/* + * platform data definition + */ +struct remoti_dev_pdata { + unsigned int id; + unsigned int reset_gpio; + unsigned int reset_polarity; +}; + +/* + * kernel API to access remoti device + */ +struct rti_udev; + +struct rti_udev *rti_get_udevice(unsigned int id); + +void rti_release_udevice(struct rti_udev *udev); + +int rti_send_sync_msg(struct rti_udev *udev, struct rti_msg *msg); + +int rti_send_async_msg(struct rti_udev *udev, struct rti_msg *msg); + +int rti_register_cmd_callback(struct rti_udev *udev, + u8 subsys, u8 cmd, + void (*cb)(void *cb_priv, + const struct rti_msg *msg), + void *cb_priv); + +void rti_unregister_cmd_callback(struct rti_udev *udev, u8 subsys, u8 cmd); + +struct rti_kcallback { + __u8 subsys; + __u8 cmd; + void (*cb)(void *cb_priv, const struct rti_msg *msg); +}; + +int rti_register_cmds_callback(struct rti_udev *udev, + const struct rti_kcallback *cbs, + size_t cb_count, + void *cb_priv); + +void rti_unregister_cmds_callback(struct rti_udev *udev, + const struct rti_kcallback *cbs, + size_t cb_count); + + +enum rti_udev_state { + RTI_UDEV_UP = 0, + RTI_UDEV_GOING_DOWN, +}; + +void rti_register_udevice_notifier(struct notifier_block *nb); +void rti_unregister_udevice_notifier(struct notifier_block *nb); + +#endif /* __KERNEL__ */ + +#endif /* __REMOTI_H */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/include/linux/smsc_cap1066.h 2013-09-03 14:19:33.354105946 +0200 @@ -0,0 +1,12 @@ +#ifndef SMSC_CAP1066_H_ +#define SMSC_CAP1066_H_ + +#define CAP1066_MAX_BTNS 6 + +struct smsc_cap1066_pdata { + unsigned short key_map[CAP1066_MAX_BTNS]; + unsigned int irq_gpio; + bool has_irq_gpio; +}; + +#endif /* ! SMSC_CAP1066_H_ */ --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/include/linux/spi/orion_tdm_spi.h 2013-09-03 14:19:33.354105946 +0200 @@ -0,0 +1,8 @@ +#ifndef __LINUX_SPI_ORION_TDM_SPI_H +#define __LINUX_SPI_ORION_TDM_SPI_H + +struct orion_tdm_spi_info { + int cs_use_gpio[2]; +}; + +#endif --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/include/linux/spi/ssd1327.h 2013-09-03 14:19:33.354105946 +0200 @@ -0,0 +1,20 @@ +#ifndef __LINUX_SPI_SSD1327_H +#define __LINUX_SPI_SSD1327_H + +struct ssd1327_platform_data { + /* attached screen info */ + unsigned int width; + unsigned int height; + + int rotate; + + /* gpio used to select command/data */ + int data_select_gpio; + + /* watchdog (second), enabled if non zero, screen is blanked + * if nothing is written for this number of seconds */ + unsigned int watchdog; +}; + +#endif /* ! __LINUX_SPI_SSD1327_H */ + --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/lib/fbxserial.c 2013-09-03 14:19:33.362106099 +0200 @@ -0,0 +1,117 @@ +#include +#include +#include +#include +#include + +#include + +#include + +#define PFX "builtin-fbxserial: " + +static void __init +fbxserialinfo_use_default(struct fbx_serial *serial) +{ + printk(KERN_WARNING PFX "warning: using default serial infos\n"); + fbxserial_set_default(serial); +} + +/* + * add trailing 0 for bundle string here. + */ +static void __init +bundle_fixup(struct fbx_serial *serial) +{ + struct fbx_serial_extinfo *p; + int i; + + for (i = 0; i < be32_to_cpu(serial->extinfo_count); i++) { + + if (i >= EXTINFO_MAX_COUNT) + break; + + p = &serial->extinfos[i]; + if (be32_to_cpu(p->type) == EXTINFO_TYPE_EXTDEV && + be32_to_cpu(p->u.extdev.type) == EXTDEV_TYPE_BUNDLE) { + int size; + + size = sizeof (p->u.extdev.serial); + p->u.extdev.serial[size - 1] = 0; + } + } +} + +/* + * called from arch code early in the boot sequence. This function + * returns 1 in case serial infos are invalid/unreadable and default + * values have been used. + */ +int __init +fbxserialinfo_read(void *data, struct fbx_serial *out) +{ + uint32_t sum; + + /* + * get partial serial data from flash/whatever. + */ + memcpy(out, data, sizeof (*out)); + + /* check magic first */ + if (be32_to_cpu(out->magic) != FBXSERIAL_MAGIC) { + printk(KERN_NOTICE PFX "invalid magic (%08x, expected %08x), " + "using defaults !\n", be32_to_cpu(out->magic), + FBXSERIAL_MAGIC); + goto out_default; + } + + /* fetch size for which we have to check CRC */ + if (be32_to_cpu(out->len) > FBXSERIAL_MAX_SIZE) { + printk(KERN_NOTICE PFX "structure size too big (%d), " + "using defaults !\n", be32_to_cpu(out->len)); + goto out_default; + } + + /* compute and check checksum */ + sum = crc32(0, data + 4, be32_to_cpu(out->len) - 4); + + if (be32_to_cpu(out->crc32) != sum) { + printk(KERN_NOTICE PFX "invalid checksum (%08x, " + "expected %08x), using defaults !\n", sum, + be32_to_cpu(out->crc32)); + goto out_default; + } + + printk(KERN_INFO PFX "Found valid serial infos !\n"); + bundle_fixup(out); + return 0; + + out_default: + fbxserialinfo_use_default(out); + bundle_fixup(out); + return 1; +} + +void +fbxserialinfo_get_random(unsigned char *data, unsigned int len) +{ + const struct fbx_serial *s; + + s = arch_get_fbxserial(); + + if (len > sizeof (s->random_data)) + len = sizeof (s->random_data); + + memcpy(data, s->random_data, len); +} +EXPORT_SYMBOL(fbxserialinfo_get_random); + +void +fbxserialinfo_get_mac_addr(unsigned char *data) +{ + const struct fbx_serial *s; + + s = arch_get_fbxserial(); + memcpy(data, s->mac_addr_base, MAC_ADDR_SIZE); +} +EXPORT_SYMBOL(fbxserialinfo_get_mac_addr); diff -Nruw linux-3.6.7-fbx/net/fbxatm./crc10.c linux-3.6.7-fbx/net/fbxatm/crc10.c --- linux-3.6.7-fbx/net/fbxatm./crc10.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/crc10.c 2013-09-03 14:19:33.366106175 +0200 @@ -0,0 +1,48 @@ +#include + +static const u16 crc10_table[256] = { + 0x0000, 0x0233, 0x0255, 0x0066, 0x0299, 0x00aa, 0x00cc, 0x02ff, + 0x0301, 0x0132, 0x0154, 0x0367, 0x0198, 0x03ab, 0x03cd, 0x01fe, + 0x0031, 0x0202, 0x0264, 0x0057, 0x02a8, 0x009b, 0x00fd, 0x02ce, + 0x0330, 0x0103, 0x0165, 0x0356, 0x01a9, 0x039a, 0x03fc, 0x01cf, + 0x0062, 0x0251, 0x0237, 0x0004, 0x02fb, 0x00c8, 0x00ae, 0x029d, + 0x0363, 0x0150, 0x0136, 0x0305, 0x01fa, 0x03c9, 0x03af, 0x019c, + 0x0053, 0x0260, 0x0206, 0x0035, 0x02ca, 0x00f9, 0x009f, 0x02ac, + 0x0352, 0x0161, 0x0107, 0x0334, 0x01cb, 0x03f8, 0x039e, 0x01ad, + 0x00c4, 0x02f7, 0x0291, 0x00a2, 0x025d, 0x006e, 0x0008, 0x023b, + 0x03c5, 0x01f6, 0x0190, 0x03a3, 0x015c, 0x036f, 0x0309, 0x013a, + 0x00f5, 0x02c6, 0x02a0, 0x0093, 0x026c, 0x005f, 0x0039, 0x020a, + 0x03f4, 0x01c7, 0x01a1, 0x0392, 0x016d, 0x035e, 0x0338, 0x010b, + 0x00a6, 0x0295, 0x02f3, 0x00c0, 0x023f, 0x000c, 0x006a, 0x0259, + 0x03a7, 0x0194, 0x01f2, 0x03c1, 0x013e, 0x030d, 0x036b, 0x0158, + 0x0097, 0x02a4, 0x02c2, 0x00f1, 0x020e, 0x003d, 0x005b, 0x0268, + 0x0396, 0x01a5, 0x01c3, 0x03f0, 0x010f, 0x033c, 0x035a, 0x0169, + 0x0188, 0x03bb, 0x03dd, 0x01ee, 0x0311, 0x0122, 0x0144, 0x0377, + 0x0289, 0x00ba, 0x00dc, 0x02ef, 0x0010, 0x0223, 0x0245, 0x0076, + 0x01b9, 0x038a, 0x03ec, 0x01df, 0x0320, 0x0113, 0x0175, 0x0346, + 0x02b8, 0x008b, 0x00ed, 0x02de, 0x0021, 0x0212, 0x0274, 0x0047, + 0x01ea, 0x03d9, 0x03bf, 0x018c, 0x0373, 0x0140, 0x0126, 0x0315, + 0x02eb, 0x00d8, 0x00be, 0x028d, 0x0072, 0x0241, 0x0227, 0x0014, + 0x01db, 0x03e8, 0x038e, 0x01bd, 0x0342, 0x0171, 0x0117, 0x0324, + 0x02da, 0x00e9, 0x008f, 0x02bc, 0x0043, 0x0270, 0x0216, 0x0025, + 0x014c, 0x037f, 0x0319, 0x012a, 0x03d5, 0x01e6, 0x0180, 0x03b3, + 0x024d, 0x007e, 0x0018, 0x022b, 0x00d4, 0x02e7, 0x0281, 0x00b2, + 0x017d, 0x034e, 0x0328, 0x011b, 0x03e4, 0x01d7, 0x01b1, 0x0382, + 0x027c, 0x004f, 0x0029, 0x021a, 0x00e5, 0x02d6, 0x02b0, 0x0083, + 0x012e, 0x031d, 0x037b, 0x0148, 0x03b7, 0x0184, 0x01e2, 0x03d1, + 0x022f, 0x001c, 0x007a, 0x0249, 0x00b6, 0x0285, 0x02e3, 0x00d0, + 0x011f, 0x032c, 0x034a, 0x0179, 0x0386, 0x01b5, 0x01d3, 0x03e0, + 0x021e, 0x002d, 0x004b, 0x0278, 0x0087, 0x02b4, 0x02d2, 0x00e1, +}; + +static u16 crc10_byte(u16 crc, const u8 c) +{ + return ((crc << 8) & 0x3ff) ^ crc10_table[(crc >> 2) & 0xff] ^ c; +} + +u16 crc10(u16 crc, const u8 *buffer, size_t len) +{ + while (len--) + crc = crc10_byte(crc, *buffer++); + return crc; +} diff -Nruw linux-3.6.7-fbx/net/fbxatm./fbxatm_2684.c linux-3.6.7-fbx/net/fbxatm/fbxatm_2684.c --- linux-3.6.7-fbx/net/fbxatm./fbxatm_2684.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/fbxatm_2684.c 2014-04-17 16:28:43.913685392 +0200 @@ -0,0 +1,838 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "fbxatm_priv.h" + +#define PFX "fbxatm_2684: " + +static LIST_HEAD(fbxatm_2684_dev_list); +static DEFINE_MUTEX(fbxatm_2684_mutex); + +#define LLC_NEEDED_HEADROOM 10 +#define VCMUX_BRIDGED_NEEDED_HEADROOM 2 + +#define LLC 0xaa, 0xaa, 0x03 +#define SNAP_BRIDGED 0x00, 0x80, 0xc2 +#define SNAP_ROUTED 0x00, 0x00, 0x00 +#define PID_ETHERNET_NOFCS 0x00, 0x07 + +static u8 llc_bridged_802d3_pad[] = { LLC, SNAP_BRIDGED, PID_ETHERNET_NOFCS, + 0, 0 }; +static u8 llc_snap_routed[] = { LLC, SNAP_ROUTED }; + +/* + * private data for 2684 vcc + */ +struct fbxatm_2684_vcc; + +struct fbxatm_2684_queue { + struct fbxatm_vcc *vcc; + unsigned int queue_idx; + struct fbxatm_2684_vcc *priv; +}; + +struct fbxatm_2684_vcc { + struct fbxatm_2684_queue queues[FBXATM_2684_MAX_VCC]; + size_t queue_count; + + struct net_device *dev; + struct fbxatm_2684_vcc_params params; + + spinlock_t tx_lock; + + struct net_device_stats stats; + + struct list_head next; +}; + +static uint32_t tel_last_ip; + +static void warn_if_tel(struct fbxatm_2684_vcc *vcc, struct sk_buff *skb) +{ + struct iphdr *iph; + struct udphdr *udph = NULL; + + iph = (struct iphdr *)skb->data; + + if (iph->protocol != IPPROTO_UDP) + return; + + if (skb_headlen(skb) < (iph->ihl * 4) + sizeof (struct udphdr)) + return; + + udph = (struct udphdr *)((unsigned char *)iph + (iph->ihl * 4)); + if (ntohs(udph->dest) >= 5004 && ntohs(udph->dest) <= 5020) { + static u32 last_ip; + static unsigned long last_time; + unsigned long now; + + now = jiffies; + if ((last_ip == iph->saddr && + (!last_time || time_before(now, last_time + 2 * HZ)))) { + static unsigned int consecutive; + consecutive++; + if (consecutive > 5) { + tel_last_ip = iph->saddr; + consecutive = 0; + } + } + + last_time = now; + last_ip = iph->saddr; + if (net_ratelimit()) + printk(KERN_WARNING "voip rtp on 8/35 - src:%pI4\n", + &iph->saddr); + } +} + +/* + * procfs read callback + */ +static int tel_proc_show(struct seq_file *m, void *v) +{ + seq_printf(m, "%pI4\n", &tel_last_ip); + return 0; +} + +static int tel_proc_write(struct file *file, const char __user *ubuf, + size_t len, loff_t *off) +{ + tel_last_ip = 0; + return len; +} + +static int tel_proc_open(struct inode *inode, struct file *file) +{ + return single_open(file, tel_proc_show, PDE(inode)->data); +} + +static const struct file_operations tel_proc_fops = { + .owner = THIS_MODULE, + .open = tel_proc_open, + .read = seq_read, + .write = tel_proc_write, + .llseek = seq_lseek, + .release = single_release, +}; + +/* + * fbxatm stack receive callback, called from softirq + */ +static void vcc_rx_callback(struct sk_buff *skb, void *data) +{ + struct fbxatm_2684_queue *queue; + struct fbxatm_2684_vcc *priv; + + queue = (struct fbxatm_2684_queue *)data; + priv = queue->priv; + + switch (priv->params.encap) { + case FBXATM_E2684_VCMUX: + switch (priv->params.payload) { + case FBXATM_P2684_BRIDGE: + /* assume 802.3, need to remove 2 bytes zero + * padding */ + if (skb->len < 2 || memcmp(skb->data, "\0\0", 2)) + goto drop; + skb_pull(skb, 2); + skb->protocol = eth_type_trans(skb, priv->dev); + memset(skb->data, 0, 2); + break; + + case FBXATM_P2684_ROUTED: + /* assume ipv4 */ + skb->protocol = htons(ETH_P_IP); + break; + } + break; + + case FBXATM_E2684_LLC: + switch (priv->params.payload) { + case FBXATM_P2684_BRIDGE: + { + /* recognize only 802.3 */ + if (skb->len < sizeof(llc_bridged_802d3_pad)) + goto drop; + + if (memcmp(skb->data, llc_bridged_802d3_pad, 7)) + goto drop; + + /* don't check the last bytes of pid, it can + * be 1 or 7 depending on the presence of + * FCS */ + skb_pull(skb, sizeof(llc_bridged_802d3_pad)); + skb->protocol = eth_type_trans(skb, priv->dev); + break; + } + + case FBXATM_P2684_ROUTED: + { + u16 proto; + unsigned int offset; + + if (skb->len < sizeof(llc_snap_routed) + 2) + goto drop; + + offset = sizeof (llc_snap_routed); + proto = skb->data[offset] << 8; + proto |= skb->data[offset + 1]; + + skb->protocol = proto; + skb_pull(skb, sizeof(llc_snap_routed) + 2); + break; + } + } + break; + } + + skb->dev = priv->dev; + skb->pkt_type = PACKET_HOST; + priv->stats.rx_bytes += skb->len; + priv->stats.rx_packets++; + + if (priv->params.encap == FBXATM_E2684_VCMUX && + priv->params.payload == FBXATM_P2684_ROUTED && + queue->vcc->vpi == 8 && queue->vcc->vci == 35) + warn_if_tel(priv, skb); + + netif_rx(skb); + return; + +drop: + priv->stats.rx_errors++; + dev_kfree_skb(skb); +} + +/* + * fbxatm stack tx done callback, called from softirq + */ +static void vcc_tx_done_callback(void *data) +{ + struct fbxatm_2684_queue *queue; + struct fbxatm_2684_vcc *priv; + + queue = (struct fbxatm_2684_queue *)data; + priv = queue->priv; + + spin_lock(&priv->tx_lock); + if (__netif_subqueue_stopped(priv->dev, queue->queue_idx)) + netif_wake_subqueue(priv->dev, queue->queue_idx); + spin_unlock(&priv->tx_lock); +} + +/* + * fbxatm stack callback when vcc link changes + */ +static void vcc_link_change(void *data, int link, + unsigned int rx_cell_rate, + unsigned int tx_cell_rate) +{ + struct fbxatm_2684_queue *queue; + struct fbxatm_2684_vcc *priv; + + queue = (struct fbxatm_2684_queue *)data; + priv = queue->priv; + + if (link) + netif_carrier_on(priv->dev); + else + netif_carrier_off(priv->dev); +} + +/* + * vcc user ops, callback from fbxatm stack + */ +static const struct fbxatm_vcc_uops fbxatm_2684_uops = { + .link_change = vcc_link_change, + .rx_pkt = vcc_rx_callback, + .tx_done = vcc_tx_done_callback, +}; + +/* + * netdevice ->ndo_select_queue() callback + */ +static u16 fbxatm_2684_netdev_select_queue(struct net_device *dev, + struct sk_buff *skb) +{ + /* force lower band to avoid kernel doing round robin */ + return 0; +} + +/* + * netdevice xmit callback + */ +static int fbxatm_2684_netdev_xmit(struct sk_buff *skb, struct net_device *dev) +{ + struct fbxatm_2684_vcc *priv; + int ret, queue_idx; + unsigned int needed_headroom; + struct fbxatm_2684_queue *queue; + + priv = netdev_priv(dev); + queue_idx = skb_get_queue_mapping(skb); + queue = &priv->queues[queue_idx]; + + /* + * check if we have to expand skb head + */ + needed_headroom = 0; + if (priv->params.encap == FBXATM_E2684_VCMUX) { + if (priv->params.payload == FBXATM_P2684_BRIDGE) + needed_headroom = VCMUX_BRIDGED_NEEDED_HEADROOM; + } else + needed_headroom = LLC_NEEDED_HEADROOM; + + if (skb_headroom(skb) < needed_headroom) { + struct sk_buff *nskb; + unsigned int new_head; + + new_head = skb_headroom(skb) + needed_headroom; + nskb = skb_realloc_headroom(skb, new_head); + dev_kfree_skb(skb); + if (!nskb) + goto dropped; + skb = nskb; + } + + switch (priv->params.encap) { + case FBXATM_E2684_VCMUX: + switch (priv->params.payload) { + case FBXATM_P2684_BRIDGE: + skb_push(skb, 2); + memset(skb->data, 0, 2); + break; + case FBXATM_P2684_ROUTED: + /* nothing to do */ + break; + } + break; + + case FBXATM_E2684_LLC: + switch (priv->params.payload) { + case FBXATM_P2684_BRIDGE: + skb_push(skb, sizeof(llc_bridged_802d3_pad)); + memcpy(skb->data, llc_bridged_802d3_pad, + sizeof(llc_bridged_802d3_pad)); + break; + + case FBXATM_P2684_ROUTED: + { + unsigned int offset; + + skb_push(skb, sizeof(llc_snap_routed)); + memcpy(skb->data, llc_snap_routed, + sizeof(llc_snap_routed)); + + offset = sizeof (llc_snap_routed); + skb->data[offset] = (skb->protocol >> 8) & 0xff; + skb->data[offset + 1] = skb->protocol & 0xff; + break; + } + } + break; + } + + spin_lock(&priv->tx_lock); + + ret = fbxatm_send(queue->vcc, skb); + if (ret) { + /* packet was not sent, queue is full */ + netif_stop_subqueue(dev, queue_idx); + spin_unlock(&priv->tx_lock); + return NETDEV_TX_BUSY; + } + + /* check if queue is full */ + priv->stats.tx_bytes += skb->len; + priv->stats.tx_packets++; + + if (fbxatm_vcc_queue_full(queue->vcc)) + netif_stop_subqueue(dev, queue_idx); + spin_unlock(&priv->tx_lock); + + return NETDEV_TX_OK; + +dropped: + priv->stats.tx_errors++; + return NETDEV_TX_OK; +} + +/* + * netdevice get_stats callback + */ +static struct net_device_stats * +fbxatm_2684_netdev_get_stats(struct net_device *dev) +{ + struct fbxatm_2684_vcc *priv; + priv = netdev_priv(dev); + return &priv->stats; +} + +/* + * netdevice setup callback for bridge encap + */ +static void setup_bridged(struct net_device *dev) +{ + ether_setup(dev); +} + +/* + * netdevice setup callback for routed encap + */ +static void setup_routed(struct net_device *dev) +{ + dev->type = ARPHRD_PPP; + dev->hard_header_len = 0; + dev->mtu = 1500; + dev->addr_len = 0; + dev->tx_queue_len = 128; + dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST; +} + +static const struct net_device_ops fbxatm_2684_ops = { + .ndo_start_xmit = fbxatm_2684_netdev_xmit, + .ndo_get_stats = fbxatm_2684_netdev_get_stats, + .ndo_select_queue = fbxatm_2684_netdev_select_queue, +}; + +/* + * sysfs callback, show encapsulation + */ +static ssize_t show_encap(struct device *d, + struct device_attribute *attr, char *buf) +{ + struct fbxatm_2684_vcc *priv = netdev_priv(to_net_dev(d)); + + switch (priv->params.encap) { + case FBXATM_E2684_LLC: + return sprintf(buf, "llc\n"); + case FBXATM_E2684_VCMUX: + default: + return sprintf(buf, "vcmux\n"); + } +} + +static DEVICE_ATTR(encap, S_IRUGO, show_encap, NULL); + +/* + * sysfs callback, show payload + */ +static ssize_t show_payload(struct device *d, + struct device_attribute *attr, char *buf) +{ + struct fbxatm_2684_vcc *priv = netdev_priv(to_net_dev(d)); + + switch (priv->params.payload) { + case FBXATM_P2684_BRIDGE: + return sprintf(buf, "bridge\n"); + case FBXATM_P2684_ROUTED: + default: + return sprintf(buf, "routed\n"); + } +} + +static DEVICE_ATTR(payload, S_IRUGO, show_payload, NULL); + +/* + * sysfs callback, show vcc id + */ +static ssize_t show_vcc(struct device *d, + struct device_attribute *attr, char *buf) +{ + struct fbxatm_2684_vcc *priv = netdev_priv(to_net_dev(d)); + + return sprintf(buf, "%u.%u.%u\n", + priv->queues[0].vcc->adev->ifindex, + priv->queues[0].vcc->vpi, priv->queues[0].vcc->vci); +} + +static DEVICE_ATTR(vcc, S_IRUGO, show_vcc, NULL); + +static struct attribute *fbxatm2684_attrs[] = { + &dev_attr_encap.attr, + &dev_attr_payload.attr, + &dev_attr_vcc.attr, + NULL +}; + +static struct attribute_group fbxatm2684_group = { + .name = "fbxatm2684", + .attrs = fbxatm2684_attrs, +}; + +/* + * create sysfs files for 2684 device + */ +static int vcc2684_sysfs_register(struct fbxatm_2684_vcc *priv, + struct net_device *dev) +{ + int ret; + + ret = sysfs_create_group(&dev->dev.kobj, &fbxatm2684_group); + if (ret) + goto out1; + + ret = sysfs_create_link(&dev->dev.kobj, + &priv->queues[0].vcc->adev->dev.kobj, + "fbxatm_dev"); + if (ret) + goto out2; + + return 0; + +out2: + sysfs_remove_group(&dev->dev.kobj, &fbxatm2684_group); +out1: + return ret; +} + +/* + * remove sysfs files for 2684 device + */ +static void vcc2684_sysfs_unregister(struct fbxatm_2684_vcc *priv, + struct net_device *dev) +{ + sysfs_remove_group(&dev->dev.kobj, &fbxatm2684_group); + sysfs_remove_link(&dev->dev.kobj, "fbxatm_dev"); +} + +/* + * register netdevice & sysfs attribute + */ +static int register_2684_netdev(struct fbxatm_2684_vcc *priv, + struct net_device *dev) +{ + int ret; + + /* hold rtnl while registering netdevice and creating sysfs + * files to avoid race */ + rtnl_lock(); + + if (strchr(dev->name, '%')) { + ret = dev_alloc_name(dev, dev->name); + if (ret < 0) + goto out; + } + + ret = register_netdevice(dev); + if (ret) + goto out; + + ret = vcc2684_sysfs_register(priv, dev); + if (ret) + goto out_unregister; + + rtnl_unlock(); + return 0; + +out_unregister: + unregister_netdevice(dev); + +out: + rtnl_unlock(); + return ret; +} + +/* + * create a RFC2684 encapsulation on given vcc + */ +static int __create_2684_vcc(const struct fbxatm_2684_vcc_params *params) +{ + struct fbxatm_2684_vcc *priv; + struct fbxatm_vcc *vccs[FBXATM_2684_MAX_VCC]; + struct net_device *dev = NULL; + void (*netdev_setup_cb)(struct net_device *dev); + unsigned int headroom; + size_t i; + int ret; + + /* sanity check */ + switch (params->encap) { + case FBXATM_E2684_VCMUX: + case FBXATM_E2684_LLC: + break; + default: + return -EINVAL; + } + + switch (params->payload) { + case FBXATM_P2684_BRIDGE: + netdev_setup_cb = setup_bridged; + break; + case FBXATM_P2684_ROUTED: + netdev_setup_cb = setup_routed; + break; + default: + return -EINVAL; + } + + if (!params->dev_name[0]) + return -EINVAL; + + /* bind to vcc */ + memset(vccs, 0, sizeof (vccs)); + for (i = 0; i < params->id_count; i++) { + struct fbxatm_vcc *vcc; + + vcc = fbxatm_bind_to_vcc(¶ms->id_list[i], + FBXATM_VCC_USER_2684); + if (IS_ERR(vcc)) { + ret = PTR_ERR(vcc); + goto fail; + } + vccs[i] = vcc; + } + + /* create netdevice */ + dev = alloc_netdev_mqs(sizeof(*priv), params->dev_name, + netdev_setup_cb, params->id_count, 1); + if (!dev) { + ret = -ENOMEM; + goto fail; + } + + netif_set_real_num_tx_queues(dev, params->id_count); + netif_set_real_num_rx_queues(dev, 1); + + priv = netdev_priv(dev); + memset(priv, 0, sizeof (priv)); + memcpy(&priv->params, params, sizeof (*params)); + memcpy(dev->name, priv->params.dev_name, IFNAMSIZ); + + spin_lock_init(&priv->tx_lock); + priv->dev = dev; + for (i = 0; i < params->id_count; i++) { + priv->queues[i].vcc = vccs[i]; + priv->queues[i].queue_idx = i; + priv->queues[i].priv = priv; + } + priv->queue_count = params->id_count; + + dev->netdev_ops = &fbxatm_2684_ops; + + /* make sure kernel generated packet have correct headroom for + * encapsulation/payload */ + headroom = 0; + for (i = 0; i < params->id_count; i++) + headroom = max_t(int, headroom, vccs[i]->adev->tx_headroom); + dev->hard_header_len += headroom; + + switch (params->encap) { + case FBXATM_E2684_VCMUX: + default: + if (params->payload == FBXATM_P2684_BRIDGE) + dev->hard_header_len += VCMUX_BRIDGED_NEEDED_HEADROOM; + break; + case FBXATM_E2684_LLC: + dev->hard_header_len += LLC_NEEDED_HEADROOM; + break; + } + + ret = register_2684_netdev(priv, dev); + if (ret) + goto fail; + + if (fbxatm_vcc_link_is_up(vccs[0])) { + netif_carrier_on(dev); + netif_tx_start_all_queues(dev); + } else + netif_carrier_off(dev); + list_add_tail(&priv->next, &fbxatm_2684_dev_list); + + for (i = 0; i < params->id_count; i++) + fbxatm_set_uops(vccs[i], &fbxatm_2684_uops, &priv->queues[i]); + + return 0; + +fail: + for (i = 0; i < ARRAY_SIZE(vccs); i++) { + if (vccs[i]) + fbxatm_unbind_vcc(vccs[i]); + } + if (dev) + free_netdev(dev); + return ret; +} + +/* + * find 2684 vcc from id list + */ +static struct fbxatm_2684_vcc *__find_2684_vcc(const struct fbxatm_vcc_id *id, + size_t count) +{ + struct fbxatm_2684_vcc *priv; + size_t i; + + /* find it */ + list_for_each_entry(priv, &fbxatm_2684_dev_list, next) { + for (i = 0; i < priv->queue_count; i++) { + struct fbxatm_2684_queue *q; + size_t j; + + q = &priv->queues[i]; + + for (j = 0; j < count; j++) { + if (q->vcc->adev->ifindex == id[j].dev_idx && + q->vcc->vpi == id[0].vpi && + q->vcc->vci == id[0].vci) + return priv; + } + } + } + return NULL; +} + +/* + * create a RFC2684 encapsulation on given vcc + */ +static int create_2684_vcc(const struct fbxatm_2684_vcc_params *params) +{ + int ret; + + mutex_lock(&fbxatm_2684_mutex); + ret = __create_2684_vcc(params); + mutex_unlock(&fbxatm_2684_mutex); + return ret; +} + +/* + * remove RFC2684 encapsulation from given vcc + */ +static int __remove_2684_vcc(const struct fbxatm_2684_vcc_params *params) +{ + struct fbxatm_2684_vcc *priv; + size_t i; + + priv = __find_2684_vcc(params->id_list, params->id_count); + if (!priv) + return -ENOENT; + + /* close netdevice, fbxatm_2684_netdev_xmit cannot be called + * again */ + rtnl_lock(); + dev_close(priv->dev); + rtnl_unlock(); + + for (i = 0; i < priv->queue_count; i++) + fbxatm_unbind_vcc(priv->queues[i].vcc); + vcc2684_sysfs_unregister(priv, priv->dev); + unregister_netdev(priv->dev); + list_del(&priv->next); + free_netdev(priv->dev); + return 0; +} + +/* + * remove RFC2684 encapsulation from given vcc + */ +static int remove_2684_vcc(const struct fbxatm_2684_vcc_params *params) +{ + int ret; + + mutex_lock(&fbxatm_2684_mutex); + ret = __remove_2684_vcc(params); + mutex_unlock(&fbxatm_2684_mutex); + return ret; +} + +/* + * 2684 related ioctl handler + */ +static int fbxatm_2684_ioctl(struct socket *sock, + unsigned int cmd, void __user *useraddr) +{ + int ret; + + ret = 0; + + switch (cmd) { + case FBXATM_2684_IOCADD: + case FBXATM_2684_IOCDEL: + { + struct fbxatm_2684_vcc_params params; + + if (copy_from_user(¶ms, useraddr, sizeof(params))) + return -EFAULT; + + if (cmd == FBXATM_2684_IOCADD) + ret = create_2684_vcc(¶ms); + else + ret = remove_2684_vcc(¶ms); + break; + } + + case FBXATM_2684_IOCGET: + { + struct fbxatm_2684_vcc_params params; + struct fbxatm_2684_vcc *priv; + + if (copy_from_user(¶ms, useraddr, sizeof(params))) + return -EFAULT; + + mutex_lock(&fbxatm_2684_mutex); + priv = __find_2684_vcc(params.id_list, params.id_count); + if (!priv) + ret = -ENOENT; + else { + memcpy(¶ms, &priv->params, sizeof (params)); + memcpy(params.dev_name, priv->dev->name, IFNAMSIZ); + } + mutex_unlock(&fbxatm_2684_mutex); + + if (ret) + return ret; + + if (copy_to_user(useraddr, ¶ms, sizeof(params))) + return -EFAULT; + break; + } + + default: + return -ENOIOCTLCMD; + } + + return ret; +} + +static struct fbxatm_ioctl fbxatm_2684_ioctl_ops = { + .handler = fbxatm_2684_ioctl, + .owner = THIS_MODULE, +}; + +int __init fbxatm_2684_init(void) +{ + struct proc_dir_entry *root, *proc; + + root = fbxatm_proc_misc_register("tel"); + if (!root) + return -ENOMEM; + + /* tel debug crap */ + proc = proc_create_data("bad_ip", 0666, root, &tel_proc_fops, NULL); + if (!proc) + return -ENOMEM; + + fbxatm_register_ioctl(&fbxatm_2684_ioctl_ops); + return 0; +} + +void fbxatm_2684_exit(void) +{ + fbxatm_unregister_ioctl(&fbxatm_2684_ioctl_ops); +} diff -Nruw linux-3.6.7-fbx/net/fbxatm./fbxatm_core.c linux-3.6.7-fbx/net/fbxatm/fbxatm_core.c --- linux-3.6.7-fbx/net/fbxatm./fbxatm_core.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/fbxatm_core.c 2013-09-03 14:19:33.366106175 +0200 @@ -0,0 +1,207 @@ +#include +#include +#include +#include +#include +#include +#include +#include "fbxatm_priv.h" + +static DEFINE_MUTEX(ioctl_mutex); +static LIST_HEAD(ioctl_list); + +void fbxatm_register_ioctl(struct fbxatm_ioctl *ioctl) +{ + mutex_lock(&ioctl_mutex); + list_add_tail(&ioctl->next, &ioctl_list); + mutex_unlock(&ioctl_mutex); +} + +void fbxatm_unregister_ioctl(struct fbxatm_ioctl *ioctl) +{ + mutex_lock(&ioctl_mutex); + list_del(&ioctl->next); + mutex_unlock(&ioctl_mutex); +} + +static int fbxatm_sock_ioctl(struct socket *sock, unsigned int cmd, + unsigned long arg) +{ + struct fbxatm_ioctl *ioctl; + void __user *useraddr; + int ret; + + /* sanity check */ + useraddr = (void __user *)arg; + + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + + ret = -ENOIOCTLCMD; + mutex_lock(&ioctl_mutex); + + list_for_each_entry(ioctl, &ioctl_list, next) { + if (!ioctl->handler) + continue; + + if (!try_module_get(ioctl->owner)) + continue; + + ret = ioctl->handler(sock, cmd, useraddr); + module_put(ioctl->owner); + if (ret != -ENOIOCTLCMD) + break; + } + mutex_unlock(&ioctl_mutex); + + return ret; +} + +static int fbxatm_sock_release(struct socket *sock) +{ + struct fbxatm_ioctl *ioctl; + struct sock *sk = sock->sk; + + mutex_lock(&ioctl_mutex); + + list_for_each_entry(ioctl, &ioctl_list, next) { + if (!ioctl->release) + continue; + + if (!try_module_get(ioctl->owner)) + continue; + + ioctl->release(sock); + module_put(ioctl->owner); + } + mutex_unlock(&ioctl_mutex); + + if (sk) + sock_put(sk); + + return 0; +} + +static const struct proto_ops fbxatm_proto_ops = { + .family = PF_FBXATM, + + .release = fbxatm_sock_release, + .ioctl = fbxatm_sock_ioctl, + + .bind = sock_no_bind, + .connect = sock_no_connect, + .socketpair = sock_no_socketpair, + .accept = sock_no_accept, + .getname = sock_no_getname, + .poll = sock_no_poll, + .listen = sock_no_listen, + .shutdown = sock_no_shutdown, + .setsockopt = sock_no_setsockopt, + .getsockopt = sock_no_getsockopt, + .sendmsg = sock_no_sendmsg, + .recvmsg = sock_no_recvmsg, + .mmap = sock_no_mmap, + .sendpage = sock_no_sendpage, + .owner = THIS_MODULE, +}; + +static struct proto fbxatm_proto = { + .name = "fbxatm", + .owner = THIS_MODULE, + .obj_size = sizeof (struct sock), +}; + +static int fbxatm_sock_create(struct net *net, struct socket *sock, + int protocol, int kern) +{ + struct sock *sk; + + sk = sk_alloc(net, PF_FBXATM, GFP_KERNEL, &fbxatm_proto); + if (!sk) + return -ENOMEM; + + sock_init_data(sock, sk); + sock->state = SS_UNCONNECTED; + sock->ops = &fbxatm_proto_ops; + return 0; +} + +static struct net_proto_family fbxatm_family_ops = { + .family = PF_FBXATM, + .create = fbxatm_sock_create, + .owner = THIS_MODULE, +}; + + +static int __init fbxatm_init(void) +{ + int ret; + + printk(KERN_INFO "Freebox ATM stack\n"); + ret = fbxatm_sysfs_init(); + if (ret) + return ret; + + ret = fbxatm_procfs_init(); + if (ret) + goto fail_sysfs; + + ret = fbxatm_vcc_init(); + if (ret) + goto fail_procfs; + + ret = fbxatm_2684_init(); + if (ret) + goto fail_vcc; + + ret = fbxatm_pppoa_init(); + if (ret) + goto fail_2684; + + ret = proto_register(&fbxatm_proto, 0); + if (ret) + goto fail_pppoa; + + ret = sock_register(&fbxatm_family_ops); + if (ret) + goto fail_proto; + + return 0; + +fail_proto: + proto_unregister(&fbxatm_proto); + +fail_pppoa: + fbxatm_pppoa_exit(); + +fail_2684: + fbxatm_2684_exit(); + +fail_vcc: + fbxatm_vcc_exit(); + +fail_procfs: + fbxatm_procfs_exit(); + +fail_sysfs: + fbxatm_sysfs_exit(); + printk(KERN_ERR "failed to initialize Freebox ATM stack\n"); + return ret; +} + +static void __exit fbxatm_exit(void) +{ + sock_unregister(PF_FBXATM); + proto_unregister(&fbxatm_proto); + fbxatm_pppoa_exit(); + fbxatm_2684_exit(); + fbxatm_vcc_exit(); + fbxatm_procfs_exit(); + fbxatm_sysfs_exit(); +} + +subsys_initcall(fbxatm_init); +module_exit(fbxatm_exit); + +MODULE_LICENSE("GPL"); +MODULE_ALIAS_NETPROTO(PF_FBXATM); diff -Nruw linux-3.6.7-fbx/net/fbxatm./fbxatm_dev.c linux-3.6.7-fbx/net/fbxatm/fbxatm_dev.c --- linux-3.6.7-fbx/net/fbxatm./fbxatm_dev.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/fbxatm_dev.c 2013-09-03 14:19:33.366106175 +0200 @@ -0,0 +1,957 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include "fbxatm_priv.h" + +/* + * list of registered device & lock + */ +LIST_HEAD(fbxatm_dev_list); + +/* + * big "rtnl" lock + */ +DEFINE_MUTEX(fbxatm_mutex); +static int fbxatm_ifindex = -1; + +/* + * find device by index + */ +static struct fbxatm_dev *__fbxatm_dev_get_by_index(int ifindex) +{ + struct fbxatm_dev *pdev; + + list_for_each_entry(pdev, &fbxatm_dev_list, next) { + if (pdev->ifindex == ifindex) + return pdev; + } + return NULL; +} + +/* + * find vcc by id + */ +static struct fbxatm_vcc * +__fbxatm_vcc_get_by_id(const struct fbxatm_vcc_id *id) +{ + struct fbxatm_dev *adev; + struct fbxatm_vcc *vcc; + int found; + + adev = __fbxatm_dev_get_by_index(id->dev_idx); + if (!adev) + return ERR_PTR(-ENODEV); + + found = 0; + list_for_each_entry(vcc, &adev->vcc_list, next) { + if (vcc->vpi != id->vpi || vcc->vci != id->vci) + continue; + found = 1; + break; + } + + if (found) + return vcc; + return ERR_PTR(-ENOENT); +} + +/* + * allocate device + */ +struct fbxatm_dev *fbxatm_alloc_device(int sizeof_priv) +{ + unsigned int size; + + size = sizeof(struct fbxatm_dev) + sizeof_priv + FBXATMDEV_ALIGN; + return kzalloc(size, GFP_KERNEL); +} + +EXPORT_SYMBOL(fbxatm_alloc_device); + +/* + * calculate crc10 of oam cell + */ +static void compute_oam_crc10(struct fbxatm_oam_cell_payload *cell) +{ + u8 *pdu; + u16 crc; + + /* crc10 does not cover header */ + pdu = (u8 *)&cell->cell_type; + memset(cell->crc10, 0, 2); + + crc = crc10(0, pdu, sizeof (*cell) - sizeof (cell->cell_hdr)); + cell->crc10[0] = crc >> 8; + cell->crc10[1] = crc & 0xff; +} + +/* + * check crc10 of oam cell + */ +static int check_oam_crc10(struct fbxatm_oam_cell_payload *cell) +{ + u8 *pdu; + u16 crc; + + pdu = (u8 *)&cell->cell_type; + + crc = (cell->crc10[0] << 8) | cell->crc10[1]; + memset(cell->crc10, 0, 2); + + if (crc != crc10(0, pdu, sizeof (*cell) - sizeof (cell->cell_hdr))) + return 1; + + return 0; +} + +/* + * send an oam ping and wait for answer + */ +static int do_oam_ping(struct fbxatm_oam_ping *ping) +{ + struct fbxatm_dev *adev; + struct fbxatm_oam_cell *oam_cell; + struct fbxatm_oam_cell_payload *cell; + u8 *hdr; + int ret; + + switch (ping->req.type) { + case FBXATM_OAM_PING_SEG_F4: + case FBXATM_OAM_PING_E2E_F4: + return -ENOTSUPP; + case FBXATM_OAM_PING_SEG_F5: + case FBXATM_OAM_PING_E2E_F5: + break; + default: + return -EINVAL; + } + + /* find device */ + mutex_lock(&fbxatm_mutex); + adev = __fbxatm_dev_get_by_index(ping->req.id.dev_idx); + if (!adev) { + ret = -ENODEV; + goto out_unlock; + } + + if (!test_bit(FBXATM_DEV_F_LINK_UP, &adev->dev_flags)) { + ret = -ENETDOWN; + goto out_unlock; + } + + /* if f5, vcc need to be opened */ + switch (ping->req.type) { + case FBXATM_OAM_PING_SEG_F5: + case FBXATM_OAM_PING_E2E_F5: + { + struct fbxatm_vcc *vcc; + + vcc = __fbxatm_vcc_get_by_id(&ping->req.id); + if (IS_ERR(vcc)) { + ret = -ENETDOWN; + goto out_unlock; + } + break; + } + + default: + break; + } + + ping->correlation_id = ++adev->oam_correlation_id; + + /* prepare atm oam cell and send it */ + oam_cell = kmalloc(sizeof (*oam_cell), GFP_KERNEL); + if (!oam_cell) { + ret = -ENOMEM; + goto out_unlock; + } + cell = &oam_cell->payload; + + hdr = cell->cell_hdr; + ATM_SET_GFC(hdr, 0); + + ATM_SET_VPI(hdr, ping->req.id.vpi); + ATM_SET_VCI(hdr, ping->req.id.vci); + if (ping->req.type == FBXATM_OAM_PING_E2E_F5) + ATM_SET_PT(hdr, OAM_PTI_END2END_F5); + else + ATM_SET_PT(hdr, OAM_PTI_SEG_F5); + ATM_SET_CLP(hdr, 0); + ATM_SET_HEC(hdr, 0); + + cell->cell_type = (OAM_TYPE_FAULT_MANAGEMENT << OAM_TYPE_SHIFT) | + (FUNC_TYPE_OAM_LOOPBACK << FUNC_TYPE_SHIFT); + cell->loopback_indication = 1; + + memcpy(cell->correlation_tag, &ping->correlation_id, + sizeof (cell->correlation_tag)); + memcpy(cell->loopback_id, ping->req.llid, sizeof (ping->req.llid)); + memset(cell->source_id, 0x6a, sizeof (cell->source_id)); + memset(cell->reserved, 0x6a, sizeof (cell->reserved)); + + compute_oam_crc10(cell); + + ret = adev->ops->send_oam(adev, oam_cell); + if (ret) + goto out_unlock; + + /* wait for an answer */ + list_add(&ping->next, &adev->oam_pending_ping); + ping->replied = 0; + init_waitqueue_head(&ping->wq); + mutex_unlock(&fbxatm_mutex); + + ret = wait_event_interruptible_timeout(ping->wq, ping->replied, + HZ * 5); + list_del(&ping->next); + + if (ret == -ERESTARTSYS) + return ret; + + if (ping->replied < 0) { + /* ping failed */ + return ping->replied; + } + + if (!ping->replied) { + /* timeout */ + return -ETIME; + } + + return 0; + + +out_unlock: + mutex_unlock(&fbxatm_mutex); + return ret; +} + +/* + * special llid values + */ +static const u8 llid_all1[16] = { 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff }; + +static const u8 llid_all0[16] = { 0 }; + +/* + * handle incoming oam cell + */ +static void handle_oam_cell(struct fbxatm_dev *adev, + struct fbxatm_oam_cell *oam_cell) +{ + struct fbxatm_oam_cell_payload *cell; + u16 vci; + u8 *hdr, pt, oam, func; + + /* check CRC10 */ + cell = &oam_cell->payload; + if (check_oam_crc10(cell)) { + adev->stats.rx_bad_oam++; + goto out; + } + + /* drop f4 cells */ + hdr = cell->cell_hdr; + vci = ATM_GET_VCI(hdr); + + if (vci == OAM_VCI_SEG_F4 || vci == OAM_VCI_END2END_F4) { + adev->stats.rx_f4_oam++; + goto out; + } + + /* keep f5 cells only */ + pt = ATM_GET_PT(hdr); + if (pt != OAM_PTI_SEG_F5 && pt != OAM_PTI_END2END_F5) { + adev->stats.rx_other_oam++; + goto out; + } + + adev->stats.rx_f5_oam++; + + /* keep oam loopback type only */ + oam = (cell->cell_type & OAM_TYPE_MASK) >> OAM_TYPE_SHIFT; + func = (cell->cell_type & FUNC_TYPE_MASK) >> FUNC_TYPE_SHIFT; + + if (oam != OAM_TYPE_FAULT_MANAGEMENT || + func != FUNC_TYPE_OAM_LOOPBACK) { + adev->stats.rx_other_oam++; + goto out; + } + + if (cell->loopback_indication & 1) { + int match, ret; + + /* request, check for llid match */ + match = 0; + switch (pt) { + case OAM_PTI_SEG_F5: + /* 0x0 or 0xffffffff */ + if (!memcmp(cell->loopback_id, llid_all0, + sizeof (llid_all0))) + match = 1; + /* fallthrough */ + + case OAM_PTI_END2END_F5: + /* 0xffffffff only */ + if (!memcmp(cell->loopback_id, llid_all1, + sizeof (llid_all1))) + match = 1; + break; + } + + if (!match) { + adev->stats.rx_bad_llid_oam++; + goto out; + } + + /* ok, update llid and answer */ + cell->loopback_indication = 0; + memcpy(cell->loopback_id, llid_all1, sizeof (llid_all1)); + compute_oam_crc10(cell); + + mutex_lock(&fbxatm_mutex); + ret = adev->ops->send_oam(adev, oam_cell); + mutex_unlock(&fbxatm_mutex); + + if (!ret) { + /* send successful, don't free cell */ + return; + } + + } else { + struct fbxatm_oam_ping *ping; + + /* reply, find a matching sender */ + mutex_lock(&fbxatm_mutex); + list_for_each_entry(ping, &adev->oam_pending_ping, next) { + + /* compare correlation id */ + if (memcmp(&ping->correlation_id, + cell->correlation_tag, + sizeof (cell->correlation_tag))) + continue; + + /* compare ping type */ + switch (ping->req.type) { + case FBXATM_OAM_PING_SEG_F5: + if (pt != OAM_PTI_SEG_F5) + continue; + break; + case FBXATM_OAM_PING_E2E_F5: + if (pt != OAM_PTI_END2END_F5) + continue; + break; + default: + break; + } + + /* seems we have a match */ + ping->replied = 1; + wake_up(&ping->wq); + } + mutex_unlock(&fbxatm_mutex); + } + +out: + kfree(oam_cell); +} + +/* + * oam rx processing workqueue + */ +static void fbxatm_oam_work(struct work_struct *work) +{ + struct fbxatm_dev *adev; + struct fbxatm_oam_cell *cell; + + adev = container_of(work, struct fbxatm_dev, oam_work); + + do { + cell = NULL; + spin_lock_bh(&adev->oam_lock); + if (!list_empty(&adev->rx_oam_cells)) { + cell = list_first_entry(&adev->rx_oam_cells, + struct fbxatm_oam_cell, next); + list_del(&cell->next); + adev->rx_oam_cells_count--; + } + spin_unlock_bh(&adev->oam_lock); + + if (cell) + handle_oam_cell(adev, cell); + + } while (cell); +} + +/* + * register given device + */ +static int __fbxatm_register_device(struct fbxatm_dev *adev, + const char *base_name, + const struct fbxatm_dev_ops *ops) +{ + struct fbxatm_dev *pdev; + int name_len, count, ret; + long *inuse; + + adev->ops = ops; + INIT_LIST_HEAD(&adev->vcc_list); + INIT_LIST_HEAD(&adev->next); + spin_lock_init(&adev->stats_lock); + spin_lock_init(&adev->oam_lock); + INIT_LIST_HEAD(&adev->rx_oam_cells); + INIT_WORK(&adev->oam_work, fbxatm_oam_work); + INIT_LIST_HEAD(&adev->oam_pending_ping); + get_random_bytes(&adev->oam_correlation_id, 4); + + name_len = strlen(base_name); + adev->name = kmalloc(name_len + 10, GFP_KERNEL); + if (!adev->name) { + ret = -ENOMEM; + goto fail; + } + + /* allocate ifindex */ + while (1) { + if (++fbxatm_ifindex < 0) + fbxatm_ifindex = 0; + if (__fbxatm_dev_get_by_index(fbxatm_ifindex)) + continue; + adev->ifindex = fbxatm_ifindex; + break; + } + + /* allocate device name */ + inuse = (long *)get_zeroed_page(GFP_ATOMIC); + if (!inuse) { + ret = -ENOMEM; + goto fail; + } + + list_for_each_entry(pdev, &fbxatm_dev_list, next) { + unsigned long val; + char *end; + + /* look for common prefix */ + if (strncmp(base_name, pdev->name, name_len)) + continue; + + /* make sure name is the same, not just a prefix */ + val = simple_strtoul(pdev->name + name_len, &end, 10); + if (!*end) + continue; + + set_bit(val, inuse); + } + + count = find_first_zero_bit(inuse, PAGE_SIZE * 8); + free_page((unsigned long)inuse); + + snprintf(adev->name, name_len + 10, "%s%d", base_name, count); + list_add_tail(&adev->next, &fbxatm_dev_list); + + /* create procfs entries */ + ret = fbxatm_proc_dev_register(adev); + if (ret) + goto fail; + + /* call device procfs init if any */ + if (adev->ops->init_procfs) { + ret = adev->ops->init_procfs(adev); + if (ret) + goto fail_procfs; + } + + /* create sysfs entries */ + ret = fbxatm_register_dev_sysfs(adev); + if (ret) + goto fail_procfs; + + return 0; + +fail_procfs: + fbxatm_proc_dev_deregister(adev); + +fail: + list_del(&adev->next); + kfree(adev->name); + return ret; +} + +/* + * take lock and register device + */ +int fbxatm_register_device(struct fbxatm_dev *adev, + const char *base_name, + const struct fbxatm_dev_ops *ops) +{ + int ret; + + mutex_lock(&fbxatm_mutex); + ret = __fbxatm_register_device(adev, base_name, ops); + mutex_unlock(&fbxatm_mutex); + return ret; +} + +EXPORT_SYMBOL(fbxatm_register_device); + +/* + * change device "link" state + */ +static void fbxatm_dev_set_link(struct fbxatm_dev *adev, int link) +{ + struct fbxatm_vcc *vcc; + + /* prevent new vcc creation and oam ping */ + mutex_lock(&fbxatm_mutex); + + if (link) { + memset(&adev->stats, 0, sizeof (adev->stats)); + list_for_each_entry(vcc, &adev->vcc_list, next) + memset(&vcc->stats, 0, sizeof (vcc->stats)); + wmb(); + set_bit(FBXATM_DEV_F_LINK_UP, &adev->dev_flags); + list_for_each_entry(vcc, &adev->vcc_list, next) { + set_bit(FBXATM_VCC_F_LINK_UP, &vcc->vcc_flags); + if (!vcc->user_ops || !vcc->user_ops->link_change) + continue; + vcc->user_ops->link_change(vcc->user_cb_data, 1, + adev->link_cell_rate_ds, + adev->link_cell_rate_us); + } + } else { + /* prevent further oam cells input */ + spin_lock_bh(&adev->oam_lock); + clear_bit(FBXATM_DEV_F_LINK_UP, &adev->dev_flags); + spin_unlock_bh(&adev->oam_lock); + + /* flush rx oam work */ + cancel_work_sync(&adev->oam_work); + + /* now disable tx on all vcc */ + list_for_each_entry(vcc, &adev->vcc_list, next) { + spin_lock_bh(&vcc->tx_lock); + clear_bit(FBXATM_VCC_F_LINK_UP, &vcc->vcc_flags); + spin_unlock_bh(&vcc->tx_lock); + if (!vcc->user_ops || !vcc->user_ops->link_change) + continue; + vcc->user_ops->link_change(vcc->user_cb_data, 0, 0, 0); + } + } + + fbxatm_dev_change_sysfs(adev); + mutex_unlock(&fbxatm_mutex); +} + +/* + * set device "link" to up, allowing vcc/device send ops to be called, + * this function sleeps + */ +void fbxatm_dev_set_link_up(struct fbxatm_dev *adev) +{ + if (!test_bit(FBXATM_DEV_F_LINK_UP, &adev->dev_flags)) + printk(KERN_INFO "%s: link UP - " + "down: %u kbit/s - up: %u kbit/s\n", adev->name, + adev->link_rate_ds / 1000, adev->link_rate_us / 1000); + return fbxatm_dev_set_link(adev, 1); +} + +EXPORT_SYMBOL(fbxatm_dev_set_link_up); + +/* + * set device link to down, disallowing any vcc/device send ops to be + * called, this function sleeps + */ +void fbxatm_dev_set_link_down(struct fbxatm_dev *adev) +{ + if (test_bit(FBXATM_DEV_F_LINK_UP, &adev->dev_flags)) + printk(KERN_INFO "%s: link DOWN\n", adev->name); + return fbxatm_dev_set_link(adev, 0); +} + +EXPORT_SYMBOL(fbxatm_dev_set_link_down); + +/* + * take lock and unregister device + */ +int fbxatm_unregister_device(struct fbxatm_dev *adev) +{ + int ret; + + ret = 0; + mutex_lock(&fbxatm_mutex); + + if (!list_empty(&adev->vcc_list)) { + ret = -EBUSY; + goto out; + } + + list_del(&adev->next); + + if (adev->ops->release_procfs) + adev->ops->release_procfs(adev); + fbxatm_proc_dev_deregister(adev); + + fbxatm_unregister_dev_sysfs(adev); +out: + mutex_unlock(&fbxatm_mutex); + return ret; +} + +EXPORT_SYMBOL(fbxatm_unregister_device); + +/* + * actually free device memory + */ +void __fbxatm_free_device(struct fbxatm_dev *adev) +{ + kfree(adev->name); + kfree(adev); +} + +/* + * free device memory + */ +void fbxatm_free_device(struct fbxatm_dev *adev) +{ + /* actual free is done in sysfs release */ +// class_device_put(&adev->class_dev); +} + +EXPORT_SYMBOL(fbxatm_free_device); + +/* + * device callback when oam cell comes in + */ +void fbxatm_netifrx_oam(struct fbxatm_dev *adev, struct fbxatm_oam_cell *cell) +{ + spin_lock_bh(&adev->oam_lock); + if (!test_bit(FBXATM_DEV_F_LINK_UP, &adev->dev_flags) || + adev->rx_oam_cells_count > 8) { + kfree(cell); + spin_unlock_bh(&adev->oam_lock); + return; + } + adev->rx_oam_cells_count++; + list_add_tail(&cell->next, &adev->rx_oam_cells); + spin_unlock_bh(&adev->oam_lock); + schedule_work(&adev->oam_work); +} + +EXPORT_SYMBOL(fbxatm_netifrx_oam); + +/* + * set user ops on vcc + */ +void fbxatm_set_uops(struct fbxatm_vcc *vcc, + const struct fbxatm_vcc_uops *user_ops, + void *user_cb_data) +{ + spin_lock_bh(&vcc->user_ops_lock); + vcc->user_ops = user_ops; + vcc->user_cb_data = user_cb_data; + spin_unlock_bh(&vcc->user_ops_lock); +} + +/* + * bind to given vcc + */ +static struct fbxatm_vcc * +__fbxatm_bind_to_vcc(const struct fbxatm_vcc_id *id, + enum fbxatm_vcc_user user) +{ + struct fbxatm_vcc *vcc; + + vcc = __fbxatm_vcc_get_by_id(id); + if (IS_ERR(vcc)) + return vcc; + + if (vcc->user != FBXATM_VCC_USER_NONE) + return ERR_PTR(-EBUSY); + + vcc->user = user; + return vcc; +} + +/* + * bind to given vcc + */ +struct fbxatm_vcc * +fbxatm_bind_to_vcc(const struct fbxatm_vcc_id *id, + enum fbxatm_vcc_user user) +{ + struct fbxatm_vcc *vcc; + + mutex_lock(&fbxatm_mutex); + vcc = __fbxatm_bind_to_vcc(id, user); + mutex_unlock(&fbxatm_mutex); + return vcc; +} + +/* + * unbind from given vcc + */ +void fbxatm_unbind_vcc(struct fbxatm_vcc *vcc) +{ + spin_lock_bh(&vcc->user_ops_lock); + vcc->user_ops = NULL; + vcc->user_cb_data = NULL; + vcc->user = FBXATM_VCC_USER_NONE; + spin_unlock_bh(&vcc->user_ops_lock); +} + +/* + * open vcc on given device + */ +static int __fbxatm_dev_open_vcc(const struct fbxatm_vcc_id *id, + const struct fbxatm_vcc_qos *qos) +{ + struct fbxatm_vcc *vcc; + struct fbxatm_dev *adev; + int ret, count; + + /* check vpi/vci unicity */ + vcc = __fbxatm_vcc_get_by_id(id); + if (!IS_ERR(vcc)) + return -EBUSY; + + /* sanity check */ + switch (qos->traffic_class) { + case FBXATM_VCC_TC_UBR_NO_PCR: + case FBXATM_VCC_TC_UBR: + break; + default: + return -EINVAL; + } + + if (qos->max_sdu > 4096) + return -EINVAL; + + if (!qos->max_buffered_pkt || qos->max_buffered_pkt > 128) + return -EINVAL; + + adev = __fbxatm_dev_get_by_index(id->dev_idx); + if (!adev) + return -ENODEV; + + /* make sure device accept requested priorities */ + if (qos->priority > adev->max_priority) + return -EINVAL; + + if (qos->rx_priority > adev->max_rx_priority) + return -EINVAL; + + /* don't open more vcc than device can handle */ + count = 0; + list_for_each_entry(vcc, &adev->vcc_list, next) + count++; + if (count + 1 > adev->max_vcc) + return -ENOSPC; + + /* make sure vpi/vci is valid for this device */ + if ((~adev->vpi_mask & id->vpi) || (~adev->vci_mask & id->vci)) + return -EINVAL; + + if (!try_module_get(adev->ops->owner)) + return -ENODEV; + + /* ok, create vcc */ + vcc = kzalloc(sizeof (*vcc), GFP_KERNEL); + if (!vcc) + return -ENOMEM; + + spin_lock_init(&vcc->user_ops_lock); + spin_lock_init(&vcc->tx_lock); + vcc->vpi = id->vpi; + vcc->vci = id->vci; + vcc->adev = adev; + vcc->to_drop_pkt = 0; + memcpy(&vcc->qos, qos, sizeof (*qos)); + + ret = adev->ops->open(vcc); + if (ret) { + kfree(vcc); + return ret; + } + + /* inherit vcc link state from device */ + if (test_bit(FBXATM_DEV_F_LINK_UP, &adev->dev_flags)) + set_bit(FBXATM_VCC_F_LINK_UP, &vcc->vcc_flags); + + list_add_tail(&vcc->next, &adev->vcc_list); + return ret; +} + +/* + * find device & open vcc on it + */ +static int fbxatm_dev_open_vcc(const struct fbxatm_vcc_id *id, + const struct fbxatm_vcc_qos *qos) +{ + int ret; + + mutex_lock(&fbxatm_mutex); + ret = __fbxatm_dev_open_vcc(id, qos); + mutex_unlock(&fbxatm_mutex); + return ret; +} + +/* + * close vcc on device + */ +static int __fbxatm_dev_close_vcc(struct fbxatm_vcc *vcc) +{ + struct fbxatm_dev *adev; + + if (vcc->user != FBXATM_VCC_USER_NONE) + return -EBUSY; + adev = vcc->adev; + module_put(adev->ops->owner); + adev->ops->close(vcc); + list_del(&vcc->next); + kfree(vcc); + return 0; +} + +/* + * find device & vcc and close it + */ +static int fbxatm_dev_close_vcc(const struct fbxatm_vcc_id *id) +{ + struct fbxatm_vcc *vcc; + int ret; + + mutex_lock(&fbxatm_mutex); + vcc = __fbxatm_vcc_get_by_id(id); + if (IS_ERR(vcc)) + ret = PTR_ERR(vcc); + else + ret = __fbxatm_dev_close_vcc(vcc); + mutex_unlock(&fbxatm_mutex); + return ret; +} + +/* + * ioctl handler + */ +static int fbxatm_vcc_ioctl(struct socket *sock, + unsigned int cmd, void __user *useraddr) +{ + int ret; + + ret = 0; + + switch (cmd) { + case FBXATM_IOCADD: + case FBXATM_IOCDEL: + { + struct fbxatm_vcc_params params; + + if (copy_from_user(¶ms, useraddr, sizeof(params))) + return -EFAULT; + + if (cmd == FBXATM_IOCADD) + ret = fbxatm_dev_open_vcc(¶ms.id, ¶ms.qos); + else + ret = fbxatm_dev_close_vcc(¶ms.id); + break; + } + + case FBXATM_IOCGET: + { + struct fbxatm_vcc_params params; + struct fbxatm_vcc *vcc; + + if (copy_from_user(¶ms, useraddr, sizeof(params))) + return -EFAULT; + + mutex_lock(&fbxatm_mutex); + vcc = __fbxatm_vcc_get_by_id(¶ms.id); + if (IS_ERR(vcc)) + ret = PTR_ERR(vcc); + else { + memcpy(¶ms.qos, &vcc->qos, sizeof (vcc->qos)); + params.user = vcc->user; + } + mutex_unlock(&fbxatm_mutex); + + if (ret) + return ret; + + if (copy_to_user(useraddr, ¶ms, sizeof(params))) + return -EFAULT; + break; + } + + case FBXATM_IOCOAMPING: + { + struct fbxatm_oam_ping ping; + + if (copy_from_user(&ping.req, useraddr, sizeof(ping.req))) + return -EFAULT; + + ret = do_oam_ping(&ping); + if (ret) + return ret; + + if (copy_to_user(useraddr, &ping.req, sizeof(ping.req))) + return -EFAULT; + break; + } + + case FBXATM_IOCDROP: + { + struct fbxatm_vcc_drop_params params; + struct fbxatm_vcc *vcc; + + if (copy_from_user(¶ms, useraddr, sizeof(params))) + return -EFAULT; + + mutex_lock(&fbxatm_mutex); + vcc = __fbxatm_vcc_get_by_id(¶ms.id); + if (IS_ERR(vcc)) + ret = PTR_ERR(vcc); + else { + spin_lock_bh(&vcc->user_ops_lock); + vcc->to_drop_pkt += params.drop_count; + spin_unlock_bh(&vcc->user_ops_lock); + ret = 0; + } + mutex_unlock(&fbxatm_mutex); + + if (ret) + return ret; + break; + } + + default: + return -ENOIOCTLCMD; + } + + return ret; +} + +static struct fbxatm_ioctl fbxatm_vcc_ioctl_ops = { + .handler = fbxatm_vcc_ioctl, + .owner = THIS_MODULE, +}; + +int __init fbxatm_vcc_init(void) +{ + fbxatm_register_ioctl(&fbxatm_vcc_ioctl_ops); + return 0; +} + +void fbxatm_vcc_exit(void) +{ + fbxatm_unregister_ioctl(&fbxatm_vcc_ioctl_ops); +} diff -Nruw linux-3.6.7-fbx/net/fbxatm./fbxatm_pppoa.c linux-3.6.7-fbx/net/fbxatm/fbxatm_pppoa.c --- linux-3.6.7-fbx/net/fbxatm./fbxatm_pppoa.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/fbxatm_pppoa.c 2013-09-03 14:19:33.366106175 +0200 @@ -0,0 +1,485 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "fbxatm_priv.h" + +#define PFX "fbxatm_pppoa: " + +static LIST_HEAD(fbxatm_pppoa_vcc_list); +static DEFINE_MUTEX(fbxatm_pppoa_mutex); + +/* + * private data for pppoa vcc + */ +struct fbxatm_pppoa_vcc { + struct fbxatm_vcc *vcc; + struct fbxatm_pppoa_vcc_params params; + enum fbxatm_pppoa_encap cur_encap; + + /* used by ppp */ + int flags; + struct ppp_channel chan; + + struct socket *sock; + struct list_head next; +}; + + +#define __LLC_HDR 0xfe, 0xfe, 0x03 +#define __NLPID_PPP 0xcf +#define __PPP_LCP 0xc0, 0x21 + +static const u8 llc_ppp[] = { __LLC_HDR, __NLPID_PPP }; +static const u8 llc_ppp_lcp[] = { __LLC_HDR, __NLPID_PPP, __PPP_LCP }; +static const u8 lcp[] = { __PPP_LCP }; + + +/* + * fbxatm stack receive callback, called from softirq + */ +static void vcc_rx_callback(struct sk_buff *skb, void *data) +{ + struct fbxatm_pppoa_vcc *priv; + + priv = (struct fbxatm_pppoa_vcc *)data; + + if (priv->chan.ppp == NULL) { + dev_kfree_skb(skb); + return; + } + + switch (priv->cur_encap) { + case FBXATM_EPPPOA_VCMUX: + /* nothing to do */ + break; + + case FBXATM_EPPPOA_LLC: + /* make sure llc header is present and remove */ + if (skb->len < sizeof(llc_ppp) || + memcmp(skb->data, llc_ppp, sizeof(llc_ppp))) + goto error; + skb_pull(skb, sizeof(llc_ppp)); + break; + + case FBXATM_EPPPOA_AUTODETECT: + /* look for lcp, with an llc header or not */ + if (skb->len >= sizeof(llc_ppp_lcp) && + !memcmp(skb->data, llc_ppp_lcp, sizeof(llc_ppp_lcp))) { + priv->cur_encap = FBXATM_EPPPOA_LLC; + skb_pull(skb, sizeof(llc_ppp)); + break; + } + + if (skb->len >= sizeof(lcp) && + !memcmp(skb->data, lcp, sizeof (lcp))) { + priv->cur_encap = FBXATM_EPPPOA_VCMUX; + break; + } + + /* no match */ + goto error; + } + + ppp_input(&priv->chan, skb); + return; + +error: + dev_kfree_skb(skb); + ppp_input_error(&priv->chan, 0); +} + +/* + * fbxatm stack tx done callback, called from softirq + */ +static void vcc_tx_done_callback(void *data) +{ + struct fbxatm_pppoa_vcc *priv; + priv = (struct fbxatm_pppoa_vcc *)data; + ppp_output_wakeup(&priv->chan); +} + +/* + * vcc user ops, callback from fbxatm stack + */ +static const struct fbxatm_vcc_uops fbxatm_pppoa_vcc_uops = { + .rx_pkt = vcc_rx_callback, + .tx_done = vcc_tx_done_callback, +}; + +/* + * ppp xmit callback + */ +static int ppp_xmit(struct ppp_channel *chan, struct sk_buff *skb) +{ + struct fbxatm_pppoa_vcc *priv; + struct sk_buff *to_send_skb, *nskb; + int ret; + + priv = (struct fbxatm_pppoa_vcc *)chan->private; + + /* MAYBE FIXME: handle protocol compression ? */ + + to_send_skb = skb; + nskb = NULL; + + /* send using vcmux encap if not yet known */ + switch (priv->cur_encap) { + case FBXATM_EPPPOA_AUTODETECT: + case FBXATM_EPPPOA_VCMUX: + break; + + case FBXATM_EPPPOA_LLC: + { + unsigned int headroom; + + headroom = skb_headroom(skb); + + if (headroom < sizeof(llc_ppp)) { + headroom += sizeof(llc_ppp); + nskb = skb_realloc_headroom(skb, headroom); + if (!nskb) { + dev_kfree_skb(skb); + return 1; + } + to_send_skb = nskb; + } + + skb_push(to_send_skb, sizeof(llc_ppp)); + memcpy(to_send_skb->data, llc_ppp, sizeof(llc_ppp)); + break; + } + } + + ret = fbxatm_send(priv->vcc, to_send_skb); + if (ret) { + /* packet was not sent, queue is full, free any newly + * created skb */ + if (nskb) + dev_kfree_skb(nskb); + else { + /* restore original skb if we altered it */ + if (priv->cur_encap == FBXATM_EPPPOA_LLC) + skb_pull(skb, sizeof(llc_ppp)); + } + + /* suspend ppp output, will be woken up by + * ppp_output_wakeup, we're called under ppp lock so + * we can't race with tx done */ + return 0; + } + + /* packet was sent, if we sent a copy free the original */ + if (nskb) + dev_kfree_skb(skb); + + if (fbxatm_vcc_queue_full(priv->vcc)) + ppp_output_stop(chan); + + return 1; +} + +static int ppp_ioctl(struct ppp_channel *chan, unsigned int cmd, + unsigned long arg) +{ + struct fbxatm_pppoa_vcc *priv; + int ret; + + priv = (struct fbxatm_pppoa_vcc *)chan->private; + + switch (cmd) { + case PPPIOCGFLAGS: + ret = put_user(priv->flags, (int __user *)arg) ? -EFAULT : 0; + break; + case PPPIOCSFLAGS: + ret = get_user(priv->flags, (int __user *) arg) ? -EFAULT : 0; + break; + default: + ret = -ENOTTY; + break; + } + return ret; +} + +static struct ppp_channel_ops fbxatm_pppoa_ppp_ops = { + .start_xmit = ppp_xmit, + .ioctl = ppp_ioctl, +}; + +/* + * find pppoa vcc from id + */ +static struct fbxatm_pppoa_vcc * +__find_pppoa_vcc(const struct fbxatm_vcc_id *id) +{ + struct fbxatm_pppoa_vcc *priv; + int found; + + /* find it */ + found = 0; + list_for_each_entry(priv, &fbxatm_pppoa_vcc_list, next) { + if (priv->vcc->adev->ifindex != id->dev_idx || + priv->vcc->vpi != id->vpi || + priv->vcc->vci != id->vci) + continue; + + found = 1; + break; + } + + if (found) + return priv; + return NULL; +} + +/* + * find pppoa vcc from socket + */ +static struct fbxatm_pppoa_vcc * +__find_pppoa_vcc_from_socket(const struct socket *sock) +{ + struct fbxatm_pppoa_vcc *priv; + int found; + + /* find it */ + found = 0; + list_for_each_entry(priv, &fbxatm_pppoa_vcc_list, next) { + if (priv->sock != sock) + continue; + + found = 1; + break; + } + + if (found) + return priv; + return NULL; +} + +/* + * bind to given vcc + */ +static int __bind_pppoa_vcc(const struct fbxatm_pppoa_vcc_params *params, + struct socket *sock) +{ + struct fbxatm_pppoa_vcc *priv; + int ret; + + /* sanity check */ + switch (params->encap) { + case FBXATM_EPPPOA_AUTODETECT: + case FBXATM_EPPPOA_VCMUX: + case FBXATM_EPPPOA_LLC: + break; + default: + return -EINVAL; + } + + priv = kzalloc(sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + memcpy(&priv->params, params, sizeof (*params)); + priv->cur_encap = params->encap; + + /* bind to vcc */ + priv->vcc = fbxatm_bind_to_vcc(¶ms->id, FBXATM_VCC_USER_PPPOA); + if (IS_ERR(priv->vcc)) { + ret = PTR_ERR(priv->vcc); + goto fail; + } + + fbxatm_set_uops(priv->vcc, &fbxatm_pppoa_vcc_uops, priv); + priv->chan.private = priv; + priv->chan.ops = &fbxatm_pppoa_ppp_ops; + priv->chan.mtu = priv->vcc->qos.max_sdu - PPP_HDRLEN; + priv->chan.hdrlen = 0; + priv->sock = sock; + + if (priv->cur_encap != FBXATM_EPPPOA_VCMUX) { + /* assume worst case if vcmux is not forced */ + priv->chan.mtu -= sizeof(llc_ppp); + priv->chan.hdrlen += sizeof(llc_ppp); + } + + priv->chan.mtu -= priv->vcc->adev->tx_headroom; + priv->chan.hdrlen += priv->vcc->adev->tx_headroom; + + ret = ppp_register_channel(&priv->chan); + if (ret) + goto fail_unbind; + list_add_tail(&priv->next, &fbxatm_pppoa_vcc_list); + return 0; + +fail_unbind: + fbxatm_unbind_vcc(priv->vcc); + +fail: + kfree(priv); + return ret; +} + +/* + * bind to given vcc + */ +static int bind_pppoa_vcc(const struct fbxatm_pppoa_vcc_params *params, + struct socket *sock) +{ + int ret; + + mutex_lock(&fbxatm_pppoa_mutex); + ret = __bind_pppoa_vcc(params, sock); + mutex_unlock(&fbxatm_pppoa_mutex); + return ret; +} + +/* + * unbind from given vcc + */ +static void __unbind_pppoa_vcc(struct fbxatm_pppoa_vcc *priv) +{ + ppp_unregister_channel(&priv->chan); + fbxatm_unbind_vcc(priv->vcc); + list_del(&priv->next); + kfree(priv); +} + +/* + * unbind from given vcc + */ +static int unbind_pppoa_vcc(const struct fbxatm_pppoa_vcc_params *params) +{ + struct fbxatm_pppoa_vcc *priv; + int ret; + + ret = 0; + mutex_lock(&fbxatm_pppoa_mutex); + priv = __find_pppoa_vcc(¶ms->id); + if (!priv) + ret = -ENOENT; + else + __unbind_pppoa_vcc(priv); + mutex_unlock(&fbxatm_pppoa_mutex); + return ret; +} + +/* + * pppoa related ioctl handler + */ +static int fbxatm_pppoa_ioctl(struct socket *sock, + unsigned int cmd, void __user *useraddr) +{ + int ret; + + ret = 0; + + switch (cmd) { + case FBXATM_PPPOA_IOCADD: + case FBXATM_PPPOA_IOCDEL: + { + struct fbxatm_pppoa_vcc_params params; + + if (copy_from_user(¶ms, useraddr, sizeof(params))) + return -EFAULT; + + if (cmd == FBXATM_PPPOA_IOCADD) + ret = bind_pppoa_vcc(¶ms, sock); + else + ret = unbind_pppoa_vcc(¶ms); + break; + } + + case FBXATM_PPPOA_IOCGET: + { + struct fbxatm_pppoa_vcc_params params; + struct fbxatm_pppoa_vcc *priv; + + if (copy_from_user(¶ms, useraddr, sizeof(params))) + return -EFAULT; + + mutex_lock(&fbxatm_pppoa_mutex); + priv = __find_pppoa_vcc(¶ms.id); + if (!priv) + ret = -ENOENT; + else + memcpy(¶ms, &priv->params, sizeof (params)); + mutex_unlock(&fbxatm_pppoa_mutex); + + if (ret) + return ret; + + if (copy_to_user(useraddr, ¶ms, sizeof(params))) + return -EFAULT; + break; + } + + case PPPIOCGCHAN: + case PPPIOCGUNIT: + { + struct fbxatm_pppoa_vcc *priv; + int value; + + value = 0; + + mutex_lock(&fbxatm_pppoa_mutex); + priv = __find_pppoa_vcc_from_socket(sock); + if (!priv) + ret = -ENOENT; + else { + if (cmd == PPPIOCGCHAN) + value = ppp_channel_index(&priv->chan); + else + value = ppp_unit_number(&priv->chan); + } + mutex_unlock(&fbxatm_pppoa_mutex); + + if (ret) + return ret; + + if (copy_to_user(useraddr, &value, sizeof(value))) + ret = -EFAULT; + break; + } + + default: + return -ENOIOCTLCMD; + } + + return ret; +} + +/* + * pppoa related release handler + */ +static void fbxatm_pppoa_release(struct socket *sock) +{ + struct fbxatm_pppoa_vcc *priv; + + mutex_lock(&fbxatm_pppoa_mutex); + priv = __find_pppoa_vcc_from_socket(sock); + if (priv) + __unbind_pppoa_vcc(priv); + mutex_unlock(&fbxatm_pppoa_mutex); +} + +static struct fbxatm_ioctl fbxatm_pppoa_ioctl_ops = { + .handler = fbxatm_pppoa_ioctl, + .release = fbxatm_pppoa_release, + .owner = THIS_MODULE, +}; + +int __init fbxatm_pppoa_init(void) +{ + fbxatm_register_ioctl(&fbxatm_pppoa_ioctl_ops); + return 0; +} + +void fbxatm_pppoa_exit(void) +{ + fbxatm_unregister_ioctl(&fbxatm_pppoa_ioctl_ops); +} diff -Nruw linux-3.6.7-fbx/net/fbxatm./fbxatm_priv.h linux-3.6.7-fbx/net/fbxatm/fbxatm_priv.h --- linux-3.6.7-fbx/net/fbxatm./fbxatm_priv.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/fbxatm_priv.h 2013-09-03 14:19:33.366106175 +0200 @@ -0,0 +1,67 @@ +#ifndef FBXATM_PRIV_H_ +#define FBXATM_PRIV_H_ + +#include +#include + +extern struct list_head fbxatm_dev_list; +extern struct mutex fbxatm_mutex; + +int __init fbxatm_vcc_init(void); + +void fbxatm_vcc_exit(void); + +void __fbxatm_free_device(struct fbxatm_dev *adev); + +int __init fbxatm_2684_init(void); + +void fbxatm_2684_exit(void); + +/* + * pppoa + */ +#ifdef CONFIG_PPP +int __init fbxatm_pppoa_init(void); + +void fbxatm_pppoa_exit(void); +#else +static inline int fbxatm_pppoa_init(void) { return 0; }; +static inline void fbxatm_pppoa_exit(void) { }; +#endif + +/* + * procfs stuff + */ +int fbxatm_proc_dev_register(struct fbxatm_dev *dev); + +void fbxatm_proc_dev_deregister(struct fbxatm_dev *dev); + +struct proc_dir_entry *fbxatm_proc_misc_register(const char *path); + +void fbxatm_proc_misc_deregister(const char *path); + +int __init fbxatm_procfs_init(void); + +void fbxatm_procfs_exit(void); + + +/* + * sysfs stuff + */ +int __init fbxatm_sysfs_init(void); + +void fbxatm_sysfs_exit(void); + +void fbxatm_dev_change_sysfs(struct fbxatm_dev *adev); + +int fbxatm_register_dev_sysfs(struct fbxatm_dev *adev); + +void fbxatm_unregister_dev_sysfs(struct fbxatm_dev *adev); + + +/* + * crc10 + */ +u16 crc10(u16 crc, const u8 *buffer, size_t len); + +#endif /* !FBXATM_PRIV_H_ */ diff -Nruw linux-3.6.7-fbx/net/fbxatm./fbxatm_procfs.c linux-3.6.7-fbx/net/fbxatm/fbxatm_procfs.c --- linux-3.6.7-fbx/net/fbxatm./fbxatm_procfs.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/fbxatm_procfs.c 2014-04-17 16:28:43.913685392 +0200 @@ -0,0 +1,340 @@ +#include +#include +#include +#include +#include +#include +#include "fbxatm_priv.h" + +static struct proc_dir_entry *fbxatm_proc_root; + +/* + * /proc/net/atm/vcc + */ +static int vcc_seq_show(struct seq_file *seq, void *v) +{ + struct fbxatm_vcc *vcc; + + if (v == (void *)SEQ_START_TOKEN) { + seq_printf(seq, "%s", + "Itf.VPI.VCI USER TC MaxSDU RX TX RXAAL5 " + "TXAAL5\n"); + return 0; + } + + vcc = (struct fbxatm_vcc *)v; + seq_printf(seq, "%d.%u.%u %d ", vcc->adev->ifindex, + vcc->vpi, vcc->vci, vcc->user); + seq_printf(seq, "%u %u ", vcc->qos.traffic_class, vcc->qos.max_sdu); + seq_printf(seq, "%lu %lu %lu %lu\n", + vcc->stats.rx_bytes, + vcc->stats.tx_bytes, + vcc->stats.rx_aal5, + vcc->stats.tx_aal5); + return 0; +} + +static void *vcc_seq_start(struct seq_file *seq, loff_t *pos) +{ + struct fbxatm_dev *adev; + struct fbxatm_vcc *tvcc, *vcc; + int count; + + mutex_lock(&fbxatm_mutex); + + if (!*pos) + return SEQ_START_TOKEN; + + count = 1; + tvcc = NULL; + list_for_each_entry(adev, &fbxatm_dev_list, next) { + list_for_each_entry(vcc, &adev->vcc_list, next) { + if (count == *pos) { + tvcc = vcc; + break; + } + count++; + } + } + + return tvcc; +} + +static void *vcc_seq_next(struct seq_file *seq, void *v, loff_t *pos) +{ + struct fbxatm_dev *adev; + struct fbxatm_vcc *last_vcc, *vcc, *tvcc; + + if (v == (void *)SEQ_START_TOKEN) { + if (list_empty(&fbxatm_dev_list)) + return NULL; + adev = list_entry(fbxatm_dev_list.next, struct fbxatm_dev, + next); + last_vcc = NULL; + } else { + last_vcc = (struct fbxatm_vcc *)v; + adev = last_vcc->adev; + } + + tvcc = NULL; + list_for_each_entry_continue(adev, &fbxatm_dev_list, next) { + + if (last_vcc && last_vcc->adev == adev) { + vcc = last_vcc; + list_for_each_entry_continue(vcc, &adev->vcc_list, + next) { + tvcc = vcc; + break; + } + } else { + list_for_each_entry(vcc, &adev->vcc_list, next) { + tvcc = vcc; + break; + } + } + } + + if (tvcc) + (*pos)++; + return tvcc; +} + +static void vcc_seq_stop(struct seq_file *seq, void *v) +{ + mutex_unlock(&fbxatm_mutex); +} + +static const struct seq_operations vcc_seq_ops = { + .start = vcc_seq_start, + .next = vcc_seq_next, + .stop = vcc_seq_stop, + .show = vcc_seq_show, +}; + +static int vcc_seq_open(struct inode *inode, struct file *file) +{ + return seq_open(file, &vcc_seq_ops); +} + +static const struct file_operations vcc_seq_fops = { + .open = vcc_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, +}; + +/* + * /proc/net/atm/dev + */ +static int adev_seq_show(struct seq_file *seq, void *v) +{ + struct fbxatm_dev *adev; + + if (v == (void *)SEQ_START_TOKEN) { + seq_printf(seq, "%s", + "Itf RX TX RXAAL5 TXAAL5 RXF4OAM TXF4OAM " + "RXF5OAM TXF5OAM RXBADOAM RXBADLLIDOAM " + "RXOTHEROAM RXDROPPED TXDROPNOLINK\n"); + return 0; + } + + adev = (struct fbxatm_dev *)v; + seq_printf(seq, "%d %lu %lu %lu %lu ", + adev->ifindex, + adev->stats.rx_bytes, + adev->stats.tx_bytes, + adev->stats.rx_aal5, + adev->stats.tx_aal5); + + seq_printf(seq, "%lu %lu %lu %lu %lu %lu %lu %lu %lu\n", + adev->stats.rx_f4_oam, + adev->stats.tx_f4_oam, + + adev->stats.rx_f5_oam, + adev->stats.tx_f5_oam, + + adev->stats.rx_bad_oam, + adev->stats.rx_bad_llid_oam, + adev->stats.rx_other_oam, + adev->stats.rx_dropped, + adev->stats.tx_drop_nolink); + return 0; +} + +static void *adev_seq_start(struct seq_file *seq, loff_t *pos) +{ + struct fbxatm_dev *adev, *tadev; + int count; + + mutex_lock(&fbxatm_mutex); + + if (!*pos) + return SEQ_START_TOKEN; + + count = 1; + tadev = NULL; + list_for_each_entry(adev, &fbxatm_dev_list, next) { + if (count == *pos) { + tadev = adev; + break; + } + count++; + } + + return tadev; +} + +static void *adev_seq_next(struct seq_file *seq, void *v, loff_t *pos) +{ + struct fbxatm_dev *adev, *tadev; + + if (v == (void *)SEQ_START_TOKEN) { + if (list_empty(&fbxatm_dev_list)) + return NULL; + adev = list_entry(fbxatm_dev_list.next, struct fbxatm_dev, + next); + } else + adev = (struct fbxatm_dev *)v; + + tadev = NULL; + list_for_each_entry_continue(adev, &fbxatm_dev_list, next) { + tadev = adev; + break; + } + + if (tadev) + (*pos)++; + return tadev; +} + +static void adev_seq_stop(struct seq_file *seq, void *v) +{ + mutex_unlock(&fbxatm_mutex); +} + +static const struct seq_operations adev_seq_ops = { + .start = adev_seq_start, + .next = adev_seq_next, + .stop = adev_seq_stop, + .show = adev_seq_show, +}; + +static int adev_seq_open(struct inode *inode, struct file *file) +{ + return seq_open(file, &adev_seq_ops); +} + +static const struct file_operations adev_seq_fops = { + .open = adev_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, +}; + + +/* + * create device private entry in proc + */ +int fbxatm_proc_dev_register(struct fbxatm_dev *adev) +{ + adev->dev_proc_entry = proc_mkdir(adev->name, fbxatm_proc_root); + if (!adev->dev_proc_entry) + return 1; + return 0; +} + + +void fbxatm_proc_dev_deregister(struct fbxatm_dev *adev) +{ + remove_proc_entry(adev->name, fbxatm_proc_root); +} + +/* + * create misc private entry in proc + */ +struct proc_dir_entry *fbxatm_proc_misc_register(const char *path) +{ + return proc_mkdir(path, fbxatm_proc_root); +} + +void fbxatm_proc_misc_deregister(const char *path) +{ + remove_proc_entry(path, fbxatm_proc_root); +} + +/* + * list of proc entries for fbxatm + */ +static struct fbxatm_proc_entry { + char *name; + const struct file_operations *proc_fops; + struct proc_dir_entry *dirent; + +} fbxatm_proc_entries[] = { + { + .name = "dev", + .proc_fops = &adev_seq_fops, + }, + { + .name = "vcc", + .proc_fops = &vcc_seq_fops, + }, +}; + +static void fbxatm_remove_proc(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(fbxatm_proc_entries); i++) { + struct fbxatm_proc_entry *e; + + e = &fbxatm_proc_entries[i]; + + if (!e->dirent) + continue; + remove_proc_entry(e->name, fbxatm_proc_root); + e->dirent = NULL; + } + + proc_net_remove(&init_net, "fbxatm"); +} + +int __init fbxatm_procfs_init(void) +{ + unsigned int i; + int ret; + + fbxatm_proc_root = proc_net_mkdir(&init_net, "fbxatm", + init_net.proc_net); + if (!fbxatm_proc_root) { + ret = -ENOMEM; + goto err; + } + + for (i = 0; i < ARRAY_SIZE(fbxatm_proc_entries); i++) { + struct proc_dir_entry *dirent; + struct fbxatm_proc_entry *e; + + e = &fbxatm_proc_entries[i]; + + dirent = create_proc_entry(e->name, S_IRUGO, fbxatm_proc_root); + if (!dirent) { + ret = -ENOMEM; + goto err; + } + dirent->proc_fops = e->proc_fops; + e->dirent = dirent; + } + + return 0; + +err: + if (fbxatm_proc_root) + fbxatm_remove_proc(); + return ret; +} + +void fbxatm_procfs_exit(void) +{ + fbxatm_remove_proc(); +} diff -Nruw linux-3.6.7-fbx/net/fbxatm./fbxatm_remote.c linux-3.6.7-fbx/net/fbxatm/fbxatm_remote.c --- linux-3.6.7-fbx/net/fbxatm./fbxatm_remote.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/fbxatm_remote.c 2014-04-17 16:28:43.913685392 +0200 @@ -0,0 +1,812 @@ +#include +#include +#include +#include +#include + +#define PFX "fbxatm_remote: " +#define MAX_PORTS 64 +#define MAX_RETRANS 10 +#define RETRANS_TIMER (HZ / 3) + +struct fbxatm_remote_ctx; + +struct fbxatm_remote_sock { + spinlock_t lock; + struct fbxatm_remote_sockaddr addr; + + struct timer_list retrans_timer; + unsigned int retrans_count; + + struct sk_buff *pending; + + /* 1 for output */ + int direction; + + /* wait ack for output, send ack for input */ + int has_ack; + + u8 seq; + + struct fbxatm_remote_ctx *ctx; + struct list_head next; +}; + +struct fbxatm_remote_ctx { + spinlock_t lock; + int dead; + + struct net_device *netdev; + u8 remote_mac[ETH_ALEN]; + u32 session_id; + + struct fbxatm_remote_sock *socks_per_lport[MAX_PORTS]; + struct sk_buff *pending_zero_ack; + + void (*timeout_cb)(void *priv); + void *priv; + + struct list_head next; +}; + +static struct list_head ctx_list; +static DEFINE_SPINLOCK(ctx_list_lock); +static void (*unknown_cb)(struct net_device *, + struct sk_buff *); + +unsigned int fbxatm_remote_headroom(struct fbxatm_remote_ctx *ctx) +{ + return sizeof (struct fbxatm_remote_hdr) + + ctx->netdev->hard_header_len + ctx->netdev->needed_headroom; +} + +EXPORT_SYMBOL(fbxatm_remote_headroom); + +/* + * allocate skb with enough headroom for header + */ +struct sk_buff *fbxatm_remote_alloc_skb(struct fbxatm_remote_ctx *ctx, + unsigned int size) +{ + struct sk_buff *skb; + unsigned int hroom_size; + + hroom_size = fbxatm_remote_headroom(ctx); + skb = dev_alloc_skb(hroom_size + size); + if (!skb) + return NULL; + skb_reserve(skb, hroom_size); + return skb; +} + +EXPORT_SYMBOL(fbxatm_remote_alloc_skb); + +/* + * return sock addr + */ +void fbxatm_remote_sock_getaddr(struct fbxatm_remote_sock *sock, + struct fbxatm_remote_sockaddr *addr) +{ + memcpy(addr, &sock->addr, sizeof (*addr)); +} + +EXPORT_SYMBOL(fbxatm_remote_sock_getaddr); + +/* + * socket retrans timer callback + */ +static void sock_timer(unsigned long data) +{ + struct fbxatm_remote_sock *sock; + struct sk_buff *skb; + + sock = (struct fbxatm_remote_sock *)data; + + spin_lock_bh(&sock->ctx->lock); + spin_lock(&sock->lock); + + if (!sock->addr.infinite_retry && sock->retrans_count >= MAX_RETRANS) { + printk(KERN_ERR PFX "retrans max reached\n"); + sock->ctx->dead = 1; + dev_kfree_skb(sock->pending); + sock->pending = NULL; + if (sock->ctx->timeout_cb) + sock->ctx->timeout_cb(sock->ctx->priv); + spin_unlock(&sock->lock); + spin_unlock_bh(&sock->ctx->lock); + return; + } + + sock->retrans_count++; + sock->retrans_timer.expires = jiffies + RETRANS_TIMER; + + skb = skb_clone(sock->pending, GFP_ATOMIC); + if (skb) + dev_queue_xmit(skb); + add_timer(&sock->retrans_timer); + + spin_unlock(&sock->lock); + spin_unlock_bh(&sock->ctx->lock); +} + +/* + * append header for given socket + */ +static int append_tx_header(struct fbxatm_remote_sock *sock, + struct sk_buff *skb) +{ + struct fbxatm_remote_hdr *hdr; + unsigned int needed; + + needed = skb->dev->hard_header_len + skb->dev->needed_headroom + + sizeof (*hdr); + + if (unlikely(skb_headroom(skb) < needed)) { + if (net_ratelimit()) + printk(KERN_WARNING PFX "headroom too small %d < %d\n", + skb_headroom(skb), needed); + } + + if (skb_cow_head(skb, needed)) + return 1; + + hdr = (struct fbxatm_remote_hdr *)skb_push(skb, sizeof (*hdr)); + skb_set_network_header(skb, 0); + + put_unaligned(htonl(FBXATM_REMOTE_MAGIC), &hdr->magic); + if (sock->direction == 1) { + /* output */ + hdr->flags = 0; + } else { + /* input */ + hdr->flags = FBXATM_RFLAGS_ACK; + } + hdr->seq = sock->seq; + put_unaligned(htons(skb->len), &hdr->len); + put_unaligned(sock->addr.lport, &hdr->sport); + put_unaligned(sock->addr.dport, &hdr->dport); + + put_unaligned(sock->addr.mtype, &hdr->mtype); + put_unaligned(sock->ctx->session_id, &hdr->session_id); + + skb->protocol = htons(ETH_P_FBXATM_REMOTE); + if (dev_hard_header(skb, skb->dev, ETH_P_FBXATM_REMOTE, + sock->ctx->remote_mac, NULL, skb->len) < 0) + return 1; + + return 0; +} + +/* + * purge socket send queue, advance next sequence + */ +void fbxatm_remote_sock_purge(struct fbxatm_remote_sock *sock) +{ + spin_lock_bh(&sock->lock); + if (sock->pending) { + del_timer_sync(&sock->retrans_timer); + dev_kfree_skb(sock->pending); + sock->pending = NULL; + sock->seq++; + } + spin_unlock_bh(&sock->lock); +} + +EXPORT_SYMBOL(fbxatm_remote_sock_purge); + +/* + * check if tx is pending on socket + */ +int fbxatm_remote_sock_pending(struct fbxatm_remote_sock *sock) +{ + int ret; + + spin_lock_bh(&sock->lock); + ret = sock->pending ? 1 : 0; + spin_unlock_bh(&sock->lock); + return ret; +} + +EXPORT_SYMBOL(fbxatm_remote_sock_pending); + +/* + * send skb on socket + */ +int fbxatm_remote_sock_send(struct fbxatm_remote_sock *sock, + struct sk_buff *skb) +{ + BUG_ON(sock->direction == 0); + + spin_lock_bh(&sock->lock); + skb->dev = sock->ctx->netdev; + + if (append_tx_header(sock, skb)) { + spin_unlock_bh(&sock->lock); + dev_kfree_skb(skb); + return 1; + } + + if (unlikely(sock->ctx->dead)) { + spin_unlock_bh(&sock->lock); + dev_kfree_skb(skb); + return 0; + } + + /* start retrans timer if needed */ + if (sock->has_ack) { + if (sock->pending) { + printk(KERN_ERR PFX "sock already has tx pending\n"); + spin_unlock_bh(&sock->lock); + dev_kfree_skb(skb); + return 1; + } + + sock->pending = skb_clone(skb, GFP_ATOMIC); + if (sock->pending) { + sock->retrans_count = 0; + sock->retrans_timer.expires = jiffies + RETRANS_TIMER; + add_timer(&sock->retrans_timer); + } + } + + spin_unlock_bh(&sock->lock); + dev_queue_xmit(skb); + + return 0; +} + +EXPORT_SYMBOL(fbxatm_remote_sock_send); + +/* + * send ack skb on socket + */ +int fbxatm_remote_sock_send_ack(struct fbxatm_remote_sock *sock, + struct sk_buff *skb) +{ + BUG_ON(sock->direction == 1); + + spin_lock_bh(&sock->lock); + + skb->dev = sock->ctx->netdev; + + if (append_tx_header(sock, skb)) { + spin_unlock_bh(&sock->lock); + dev_kfree_skb(skb); + return 1; + } + + if (unlikely(sock->ctx->dead)) { + spin_unlock_bh(&sock->lock); + dev_kfree_skb(skb); + return 0; + } + + skb->dev = sock->ctx->netdev; + sock->pending = skb_clone(skb, GFP_ATOMIC); + spin_unlock_bh(&sock->lock); + dev_queue_xmit(skb); + + return 0; +} + +EXPORT_SYMBOL(fbxatm_remote_sock_send_ack); + +/* + * send raw ack + */ +int fbxatm_remote_sock_send_raw_ack(struct fbxatm_remote_ctx *ctx, + struct net_device *dev, + u8 *remote_mac, + struct fbxatm_remote_hdr *hdr, + struct sk_buff *ack) +{ + struct fbxatm_remote_hdr *ack_hdr; + + if (skb_cow_head(ack, sizeof (*ack_hdr))) { + dev_kfree_skb(ack); + return 1; + } + + ack_hdr = (struct fbxatm_remote_hdr *)skb_push(ack, sizeof (*hdr)); + skb_set_network_header(ack, 0); + + put_unaligned(htonl(FBXATM_REMOTE_MAGIC), &ack_hdr->magic); + ack_hdr->flags = FBXATM_RFLAGS_ACK; + ack_hdr->seq = hdr->seq; + + put_unaligned(htons(ack->len), &ack_hdr->len); + put_unaligned(hdr->dport, &ack_hdr->sport); + put_unaligned(hdr->sport, &ack_hdr->dport); + put_unaligned(hdr->mtype, &ack_hdr->mtype); + put_unaligned(hdr->session_id, &ack_hdr->session_id); + + ack->dev = dev; + + if (dev_hard_header(ack, dev, ETH_P_FBXATM_REMOTE, + remote_mac, NULL, ack->len) < 0) { + dev_kfree_skb(ack); + return 1; + } + + if (hdr->dport == 0) { + kfree(ctx->pending_zero_ack); + ctx->pending_zero_ack = skb_clone(ack, GFP_ATOMIC); + } + + if (dev_queue_xmit(ack)) + return 1; + + return 0; +} + +EXPORT_SYMBOL(fbxatm_remote_sock_send_raw_ack); + +/* + * handle input data on 'in' direction socket + */ +static void __in_sock_rcv(struct fbxatm_remote_sock *sock, + struct sk_buff *skb, + struct fbxatm_remote_hdr *hdr) +{ + struct sk_buff *ack; + int ret; + + spin_lock(&sock->lock); + + if (sock->has_ack) { + u8 expected_seq; + + /* check for duplicate seq */ + if (hdr->seq == sock->seq) { + + /* got last packet again, ack has been + * lost, send it again if we have it */ + if (sock->pending) { + ack = skb_clone(sock->pending, GFP_ATOMIC); + if (ack) + dev_queue_xmit(ack); + } + + spin_unlock(&sock->lock); + dev_kfree_skb(skb); + return; + } + + expected_seq = sock->seq + 1; + if (hdr->seq != expected_seq) { + /* lost sync */ + spin_unlock(&sock->lock); + dev_kfree_skb(skb); + return; + } + + /* about to accept new packet, free any pending ack */ + dev_kfree_skb(sock->pending); + sock->pending = NULL; + + sock->seq = hdr->seq; + + /* set sock dport to last receive packet to send + * correct ack */ + sock->addr.dport = hdr->sport; + } + + /* deliver packet to socket */ + ret = sock->addr.deliver(sock->addr.priv, skb, &ack); + + if (!sock->has_ack || !ret) { + /* don't send ack now */ + spin_unlock(&sock->lock); + return; + } + + if (!ack) { + /* generate empty ack */ + ack = fbxatm_remote_alloc_skb(sock->ctx, 0); + if (!ack) { + spin_unlock(&sock->lock); + return; + } + } + + ack->dev = sock->ctx->netdev; + + if (append_tx_header(sock, ack)) { + spin_unlock(&sock->lock); + dev_kfree_skb(ack); + return; + } + + sock->pending = ack; + + /* send ack now */ + ack = skb_clone(sock->pending, GFP_ATOMIC); + spin_unlock(&sock->lock); + + if (ack) + dev_queue_xmit(ack); +} + +/* + * handle data on 'out' direction socket + */ +static void __out_sock_rcv(struct fbxatm_remote_sock *sock, + struct sk_buff *skb, + struct fbxatm_remote_hdr *hdr) +{ + if (!sock->has_ack) { + dev_kfree_skb(skb); + printk(KERN_ERR PFX "ack for non ack sock\n"); + return; + } + + spin_lock(&sock->lock); + + /* check if ack if for last sent seq */ + if (hdr->seq != sock->seq) { + spin_unlock(&sock->lock); + dev_kfree_skb(skb); + return; + } + + /* make sure we're expecting it */ + if (!sock->pending) { + spin_unlock(&sock->lock); + dev_kfree_skb(skb); + return; + } + + del_timer_sync(&sock->retrans_timer); + dev_kfree_skb(sock->pending); + sock->pending = NULL; + sock->seq++; + + if (sock->addr.response) + sock->addr.response(sock->addr.priv, skb); + else + dev_kfree_skb(skb); + + spin_unlock(&sock->lock); +} + +/* + * fbxatm ethertype rx callback + */ +static int fbxatm_rcv(struct sk_buff *skb, struct net_device *dev, + struct packet_type *pt, struct net_device *orig_dev) +{ + struct fbxatm_remote_hdr *hdr; + struct fbxatm_remote_ctx *ctx; + int found; + unsigned int len; + u16 port; + + if (!netif_running(dev)) { + dev_kfree_skb(skb); + return 0; + } + + skb = skb_unshare(skb, GFP_ATOMIC); + if (!skb) + return 0; + + /* decode fbxatm ethertype */ + if (!pskb_may_pull(skb, sizeof (*hdr))) { + dev_kfree_skb(skb); + return 0; + } + + hdr = (struct fbxatm_remote_hdr *)skb_network_header(skb); + if (ntohl(hdr->magic) != FBXATM_REMOTE_MAGIC) { + if (net_ratelimit()) + printk(KERN_ERR PFX "bad fbxatm remote magic: %08x\n", + ntohl(hdr->magic)); + dev_kfree_skb(skb); + return 0; + } + + /* check len */ + len = ntohs(hdr->len); + if (skb->len < len) { + if (net_ratelimit()) + printk(KERN_ERR PFX "short packet\n"); + dev_kfree_skb(skb); + return 0; + } + + /* trim skb to correct size */ + if (pskb_trim(skb, len)) { + dev_kfree_skb(skb); + return 0; + } + + port = ntohs(hdr->dport); + if (port >= MAX_PORTS) { + dev_kfree_skb(skb); + printk(KERN_ERR PFX "bad port %u\n", port); + return 0; + } + + /* remove header */ + skb_set_network_header(skb, 0); + __skb_pull(skb, sizeof (*hdr)); + skb_set_transport_header(skb, 0); + + /* find context by mac/session id */ + found = 0; + spin_lock_bh(&ctx_list_lock); + list_for_each_entry(ctx, &ctx_list, next) { + struct ethhdr *eth; + struct fbxatm_remote_sock *sock; + int is_ack; + + eth = eth_hdr(skb); + if (memcmp(eth->h_source, ctx->remote_mac, ETH_ALEN)) { + spin_unlock(&ctx->lock); + continue; + } + + if (hdr->session_id != ctx->session_id) + continue; + + spin_lock(&ctx->lock); + + if (unlikely(ctx->dead)) { + spin_unlock(&ctx->lock); + continue; + } + + /* found context, find socket by port */ + found = 1; + + /* special case for port 0, in case ack is lost */ + if (port == 0 && ctx->pending_zero_ack) { + struct sk_buff *ack; + ack = skb_clone(ctx->pending_zero_ack, GFP_ATOMIC); + if (ack) + dev_queue_xmit(ack); + spin_unlock(&ctx->lock); + break; + } + + sock = ctx->socks_per_lport[port]; + if (!sock) { + printk(KERN_ERR PFX "context but no socket for " + "port: %u\n", port); + spin_unlock(&ctx->lock); + break; + } + + if (hdr->mtype != sock->addr.mtype) { + printk(KERN_ERR PFX "incorrect mtype for sock\n"); + spin_unlock(&ctx->lock); + break; + } + + /* check direction, we should only get ack for output + * socket */ + is_ack = (hdr->flags & FBXATM_RFLAGS_ACK) ? 1 : 0; + if (sock->direction ^ is_ack) { + printk(KERN_ERR PFX "incorrect ack value for sock\n"); + spin_unlock(&ctx->lock); + break; + } + + /* ok deliver */ + if (sock->direction) + __out_sock_rcv(sock, skb, hdr); + else + __in_sock_rcv(sock, skb, hdr); + + spin_unlock(&ctx->lock); + spin_unlock_bh(&ctx_list_lock); + return 0; + } + + spin_unlock_bh(&ctx_list_lock); + + if (!found && unknown_cb) + unknown_cb(dev, skb); + else + dev_kfree_skb(skb); + + return 0; +} + +void fbxatm_remote_set_unknown_cb(void (*cb)(struct net_device *, + struct sk_buff *)) +{ + unknown_cb = cb; +} + +EXPORT_SYMBOL(fbxatm_remote_set_unknown_cb); + +/* + * allocate local port for socket + */ +static int __alloc_lport(struct fbxatm_remote_ctx *ctx, + struct fbxatm_remote_sock *sock) +{ + int i; + + for (i = 1; i < ARRAY_SIZE(ctx->socks_per_lport); i++) { + if (ctx->socks_per_lport[i]) + continue; + sock->addr.lport = htons(i); + ctx->socks_per_lport[i] = sock; + return 0; + } + return -EADDRINUSE; +} + +static struct fbxatm_remote_sock *sock_new(struct fbxatm_remote_sockaddr *addr) +{ + struct fbxatm_remote_sock *sock; + + sock = kzalloc(sizeof (*sock), GFP_KERNEL); + if (!sock) + return NULL; + memcpy(&sock->addr, addr, sizeof (*addr)); + init_timer(&sock->retrans_timer); + spin_lock_init(&sock->lock); + sock->retrans_timer.data = (unsigned long)sock; + sock->retrans_timer.function = sock_timer; + return sock; +} + +struct fbxatm_remote_sock * +fbxatm_remote_sock_connect(struct fbxatm_remote_ctx *ctx, + struct fbxatm_remote_sockaddr *addr, + int need_ack) +{ + struct fbxatm_remote_sock *sock; + + sock = sock_new(addr); + if (!sock) + return NULL; + + spin_lock_bh(&ctx->lock); + sock->ctx = ctx; + if (__alloc_lport(ctx, sock)) { + spin_unlock_bh(&ctx->lock); + kfree(sock); + return NULL; + } + + sock->direction = 1; + sock->seq = 0; + sock->has_ack = need_ack; + spin_unlock_bh(&ctx->lock); + + return sock; +} + +EXPORT_SYMBOL(fbxatm_remote_sock_connect); + +struct fbxatm_remote_sock * +fbxatm_remote_sock_bind(struct fbxatm_remote_ctx *ctx, + struct fbxatm_remote_sockaddr *addr, + int send_ack) +{ + struct fbxatm_remote_sock *sock; + + sock = sock_new(addr); + if (!sock) + return NULL; + + spin_lock_bh(&ctx->lock); + sock->ctx = ctx; + if (__alloc_lport(ctx, sock)) { + spin_unlock_bh(&ctx->lock); + kfree(sock); + return NULL; + } + + sock->direction = 0; + sock->seq = ~0; + sock->has_ack = send_ack; + spin_unlock_bh(&ctx->lock); + + return sock; +} + +EXPORT_SYMBOL(fbxatm_remote_sock_bind); + +void fbxatm_remote_sock_close(struct fbxatm_remote_sock *sock) +{ + spin_lock_bh(&sock->ctx->lock); + if (sock->addr.lport) + sock->ctx->socks_per_lport[ntohs(sock->addr.lport)] = NULL; + + spin_lock(&sock->lock); + del_timer_sync(&sock->retrans_timer); + dev_kfree_skb(sock->pending); + spin_unlock(&sock->lock); + spin_unlock_bh(&sock->ctx->lock); + kfree(sock); +} + +EXPORT_SYMBOL(fbxatm_remote_sock_close); + +struct fbxatm_remote_ctx *fbxatm_remote_alloc_ctx(struct net_device *netdev, + u8 *remote_mac, + u32 session_id, + void (*timeout)(void *priv), + void *priv) +{ + struct fbxatm_remote_ctx *ctx; + + ctx = kzalloc(sizeof (*ctx), GFP_KERNEL); + if (!ctx) + return NULL; + ctx->netdev = netdev; + spin_lock_init(&ctx->lock); + memcpy(ctx->remote_mac, remote_mac, ETH_ALEN); + ctx->session_id = session_id; + ctx->timeout_cb = timeout; + ctx->priv = priv; + + spin_lock_bh(&ctx_list_lock); + list_add_tail(&ctx->next, &ctx_list); + spin_unlock_bh(&ctx_list_lock); + + return ctx; +} + +EXPORT_SYMBOL(fbxatm_remote_alloc_ctx); + +void fbxatm_remote_ctx_set_dead(struct fbxatm_remote_ctx *ctx) +{ + spin_lock_bh(&ctx->lock); + ctx->dead = 1; + spin_unlock_bh(&ctx->lock); +} + +EXPORT_SYMBOL(fbxatm_remote_ctx_set_dead); + +void fbxatm_remote_free_ctx(struct fbxatm_remote_ctx *ctx) +{ + int i; + + spin_lock_bh(&ctx_list_lock); + spin_lock(&ctx->lock); + + for (i = 1; i < ARRAY_SIZE(ctx->socks_per_lport); i++) { + if (!ctx->socks_per_lport[i]) + continue; + printk(KERN_ERR PFX "socket count is not 0\n"); + spin_unlock(&ctx->lock); + spin_unlock_bh(&ctx_list_lock); + return; + } + + kfree(ctx->pending_zero_ack); + list_del(&ctx->next); + spin_unlock(&ctx->lock); + spin_unlock_bh(&ctx_list_lock); + kfree(ctx); +} + +EXPORT_SYMBOL(fbxatm_remote_free_ctx); + +static struct packet_type fbxatm_packet_type = { + .type = __constant_htons(ETH_P_FBXATM_REMOTE), + .func = fbxatm_rcv, +}; + +int fbxatm_remote_init(void) +{ + spin_lock_init(&ctx_list_lock); + INIT_LIST_HEAD(&ctx_list); + dev_add_pack(&fbxatm_packet_type); + return 0; +} + +EXPORT_SYMBOL(fbxatm_remote_init); + +void fbxatm_remote_exit(void) +{ + dev_remove_pack(&fbxatm_packet_type); +} + +EXPORT_SYMBOL(fbxatm_remote_exit); diff -Nruw linux-3.6.7-fbx/net/fbxatm./fbxatm_remote_driver.c linux-3.6.7-fbx/net/fbxatm/fbxatm_remote_driver.c --- linux-3.6.7-fbx/net/fbxatm./fbxatm_remote_driver.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/fbxatm_remote_driver.c 2014-04-17 16:28:43.913685392 +0200 @@ -0,0 +1,1123 @@ +/* + * "remote" driver for fbxatm, "connect" to a remote fbxatm stack in + * net stub mode and control its PHYs + * + * Copyright (C) 2009 Maxime Bizon + */ +#include +#include +#include +#include +#include + +#include "fbxatm_remote_driver.h" + +#define PFX "fbxatm_remote_driver: " + +static struct list_head remote_dev_list; +static DEFINE_SPINLOCK(remote_lock); + +/* + * request moving to dead state and schedule + */ +static void set_dying(struct driver_remote *priv) +{ + priv->want_die = 1; + schedule_delayed_work(&priv->fsm_work, 0); +} + +/* + * socket deliver callback for vcc_rx socket + */ +static int vcc_rx_deliver(void *data, struct sk_buff *skb, + struct sk_buff **ack) +{ + struct driver_remote_vcc *pvcc; + + pvcc = (struct driver_remote_vcc *)data; + fbxatm_netifrx(pvcc->vcc, skb); + return 0; +} + +/* + * socket deliver callback for vcc_qempty socket + */ +static int vcc_qempty_deliver(void *data, struct sk_buff *skb, + struct sk_buff **ack) +{ + struct driver_remote_vcc *pvcc; + struct driver_remote *priv; + + pvcc = (struct driver_remote_vcc *)data; + priv = pvcc->priv; + + spin_lock(&priv->tx_lock); + + if (pvcc->tx_pending) { + /* wait until we get tx ack */ + pvcc->tx_got_qempty = 1; + goto send_ack; + } + + /* report tx done event */ + clear_bit(FBXATM_VCC_F_FULL, &pvcc->vcc->vcc_flags); + fbxatm_tx_done(pvcc->vcc); + +send_ack: + dev_kfree_skb(skb); + *ack = NULL; + spin_unlock(&priv->tx_lock); + /* send ack now */ + return 1; +} + +/* + * socket response callback for vcc_send socket, called with bh + * disabled + */ +static void vcc_send_response(void *data, struct sk_buff *skb) +{ + struct fbxatm_remote_vcc_send_ack *pkt_ack; + struct driver_remote_vcc *pvcc; + struct driver_remote *priv; + + pvcc = (struct driver_remote_vcc *)data; + priv = pvcc->priv; + + spin_lock(&priv->tx_lock); + + if (unlikely(!pvcc->tx_pending)) { + printk(KERN_ERR PFX "send response while no tx pending\n"); + goto out; + } + + if (!pskb_may_pull(skb, sizeof (*pkt_ack))) { + printk(KERN_ERR PFX "bad vcc send ack\n"); + goto out; + } + + pvcc->tx_pending = 0; + + pkt_ack = (struct fbxatm_remote_vcc_send_ack *)skb->data; + if (pkt_ack->full) { + /* qempty will wake us up later, but maybe we got it + * already ? */ + if (!pvcc->tx_got_qempty) + goto out; + } + + /* wake up queue */ + clear_bit(FBXATM_VCC_F_FULL, &pvcc->vcc->vcc_flags); + fbxatm_tx_done(pvcc->vcc); + +out: + spin_unlock(&priv->tx_lock); + dev_kfree_skb(skb); +} + +/* + * fbxatm request to send aal5 on given vcc, called with bh disabled + */ +static int remote_send(struct fbxatm_vcc *vcc, struct sk_buff *skb) +{ + struct driver_remote_vcc *pvcc; + struct driver_remote *priv; + + pvcc = vcc->dev_priv; + priv = pvcc->priv; + + spin_lock(&priv->tx_lock); + if (priv->state != RSTATE_S_ACTIVE) + goto drop; + + if (test_bit(FBXATM_VCC_F_FULL, &vcc->vcc_flags)) { + spin_unlock(&priv->tx_lock); + /* return queue full */ + return 1; + } + + if (fbxatm_remote_sock_send(pvcc->vcc_send_sock, skb)) { + /* packet has been dropped */ + spin_unlock(&priv->tx_lock); + return 0; + } + + set_bit(FBXATM_VCC_F_FULL, &vcc->vcc_flags); + pvcc->tx_pending = 1; + pvcc->tx_got_qempty = 0; + + spin_unlock(&priv->tx_lock); + return 0; + +drop: + spin_unlock(&priv->tx_lock); + dev_kfree_skb(skb); + return 0; +} + +/* + * sleep until we get an ack for sockets using wq + */ +static int __wait_ack(struct driver_remote *priv) +{ + wait_event(priv->wq, priv->wq_res != 0 || + priv->state != RSTATE_S_ACTIVE); + + if (priv->wq_res == 2 || priv->state != RSTATE_S_ACTIVE) { + /* timeout or device will die soon */ + return -EIO; + } + + return 0; +} + +/* + * fbxatm callback to send oam cell + */ +static int remote_send_oam(struct fbxatm_dev *adev, + struct fbxatm_oam_cell *cell) +{ + struct driver_remote *priv; + struct sk_buff *skb; + int ret; + + priv = fbxatm_dev_priv(adev); + mutex_lock(&priv->mutex); + + if (priv->state != RSTATE_S_ACTIVE) { + mutex_unlock(&priv->mutex); + return -ENODEV; + } + + /* prepare outgoing packet */ + skb = fbxatm_remote_alloc_skb(priv->remote_ctx, + sizeof (cell->payload)); + if (!skb) { + mutex_unlock(&priv->mutex); + kfree(cell); + return -ENOMEM; + } + + memcpy(skb_put(skb, sizeof (cell->payload)), &cell->payload, + sizeof (cell->payload)); + kfree(cell); + + /* send & wait for ack */ + skb_queue_purge(&priv->wq_acks); + priv->wq_res = 0; + + if (fbxatm_remote_sock_send(priv->dev_send_oam_sock, skb)) + return -ENOMEM; + + ret = __wait_ack(priv); + mutex_unlock(&priv->mutex); + + if (ret) + return ret; + + return 0; +} + +/* + * fbxatm callback to open given vcc + */ +static int remote_vcc_open(struct fbxatm_vcc *vcc) +{ + struct fbxatm_remote_vcc_action *pkt; + struct fbxatm_remote_vcc_action_ack *pkt_ack; + struct sk_buff *skb, *ack; + struct fbxatm_remote_sockaddr addr; + struct driver_remote_vcc *pvcc; + struct driver_remote *priv; + int ret; + + priv = fbxatm_dev_priv(vcc->adev); + mutex_lock(&priv->mutex); + + if (priv->state != RSTATE_S_ACTIVE) { + mutex_unlock(&priv->mutex); + return -EIO; + } + + /* allocate private vcc context */ + pvcc = kzalloc(sizeof (*pvcc), GFP_KERNEL); + if (!pvcc) { + mutex_unlock(&priv->mutex); + return -ENOMEM; + } + + pvcc->priv = priv; + pvcc->vcc = vcc; + vcc->dev_priv = pvcc; + + /* open input sockets */ + memset(&addr, 0, sizeof (addr)); + addr.mtype = htonl(FBXATM_RMT_VCC_RX); + addr.priv = pvcc; + addr.deliver = vcc_rx_deliver; + pvcc->vcc_rx_sock = fbxatm_remote_sock_bind(priv->remote_ctx, + &addr, 0); + if (!pvcc->vcc_rx_sock) { + ret = -ENOMEM; + goto fail; + } + + memset(&addr, 0, sizeof (addr)); + addr.mtype = htonl(FBXATM_RMT_VCC_QEMPTY); + addr.priv = pvcc; + addr.deliver = vcc_qempty_deliver; + pvcc->vcc_qempty_sock = fbxatm_remote_sock_bind(priv->remote_ctx, + &addr, 1); + if (!pvcc->vcc_qempty_sock) { + ret = -ENOMEM; + goto fail; + } + + /* prepare outgoing packet */ + skb = fbxatm_remote_alloc_skb(priv->remote_ctx, + sizeof (*pkt)); + if (!skb) { + ret = -ENOMEM; + goto fail; + } + pkt = (struct fbxatm_remote_vcc_action *)skb_put(skb, sizeof (*pkt)); + pkt->action = htonl(1); + + fbxatm_remote_sock_getaddr(pvcc->vcc_rx_sock, &addr); + pkt->vcc_rx_port = addr.lport; + + fbxatm_remote_sock_getaddr(pvcc->vcc_qempty_sock, &addr); + pkt->vcc_qempty_port = addr.lport; + + pkt->vpi = htonl(vcc->vpi); + pkt->vci = htonl(vcc->vci); + pkt->traffic_class = htonl(vcc->qos.traffic_class); + pkt->max_sdu = htonl(vcc->qos.max_sdu); + pkt->max_buffered_pkt = htonl(vcc->qos.max_buffered_pkt); + pkt->priority = htonl(vcc->qos.priority); + pkt->rx_priority = htonl(vcc->qos.rx_priority); + + /* send & wait for ack */ + skb_queue_purge(&priv->wq_acks); + priv->wq_res = 0; + + if (fbxatm_remote_sock_send(priv->vcc_action_sock, skb)) { + ret = -ENOMEM; + goto fail; + } + + ret = __wait_ack(priv); + + if (ret) { + /* timeout, device will die soon */ + goto fail; + } + + /* check ack */ + ack = skb_dequeue(&priv->wq_acks); + if (!pskb_may_pull(ack, sizeof (*pkt_ack))) { + printk(KERN_ERR PFX "bad vcc action ack\n"); + dev_kfree_skb(ack); + set_dying(priv); + ret = -EIO; + goto fail; + } + + pkt_ack = (struct fbxatm_remote_vcc_action_ack *)ack->data; + if (pkt_ack->ret) { + printk(KERN_ERR PFX "remote vcc open failed\n"); + dev_kfree_skb(ack); + set_dying(priv); + ret = -EIO; + goto fail; + } + + pvcc->remote_id = pkt_ack->vcc_remote_id; + + memset(&addr, 0, sizeof (addr)); + addr.mtype = htonl(FBXATM_RMT_VCC_SEND); + addr.priv = pvcc; + addr.dport = pkt_ack->vcc_send_port; + addr.response = vcc_send_response; + pvcc->vcc_send_sock = fbxatm_remote_sock_connect(priv->remote_ctx, + &addr, 1); + if (!pvcc->vcc_send_sock) { + dev_kfree_skb(ack); + set_dying(priv); + ret = -EIO; + goto fail; + } + + dev_kfree_skb(ack); + list_add(&pvcc->next, &priv->pvcc_list); + mutex_unlock(&priv->mutex); + return 0; + +fail: + if (pvcc->vcc_qempty_sock) + fbxatm_remote_sock_close(pvcc->vcc_qempty_sock); + if (pvcc->vcc_rx_sock) + fbxatm_remote_sock_close(pvcc->vcc_rx_sock); + kfree(pvcc); + mutex_unlock(&priv->mutex); + return ret; +} + +/* + * fbxatm callback to close & flush given vcc + */ +static void remote_vcc_close(struct fbxatm_vcc *vcc) +{ + struct driver_remote *priv; + struct driver_remote_vcc *pvcc; + struct sk_buff *skb, *ack; + struct fbxatm_remote_vcc_action *pkt; + struct fbxatm_remote_vcc_action_ack *pkt_ack; + int ret; + + priv = fbxatm_dev_priv(vcc->adev); + mutex_lock(&priv->mutex); + + pvcc = vcc->dev_priv; + + if (priv->state != RSTATE_S_ACTIVE) { + /* just close vcc, don't tell remote */ + list_del(&pvcc->next); + kfree(pvcc); + + /* warn fsm so it can restart */ + schedule_delayed_work(&priv->fsm_work, 0); + goto out_unlock; + } + + /* prepare outgoing packet */ + skb = fbxatm_remote_alloc_skb(priv->remote_ctx, + sizeof (*pkt)); + if (!skb) { + set_dying(priv); + goto out_unlock; + } + + pkt = (struct fbxatm_remote_vcc_action *)skb_put(skb, sizeof (*pkt)); + pkt->action = htonl(0); + pkt->vcc_remote_id = pvcc->remote_id; + + /* free vcc now, failure will trigger dead state */ + fbxatm_remote_sock_close(pvcc->vcc_send_sock); + fbxatm_remote_sock_close(pvcc->vcc_rx_sock); + fbxatm_remote_sock_close(pvcc->vcc_qempty_sock); + list_del(&pvcc->next); + kfree(pvcc); + + /* send & wait for ack */ + skb_queue_purge(&priv->wq_acks); + priv->wq_res = 0; + + if (fbxatm_remote_sock_send(priv->vcc_action_sock, skb)) { + set_dying(priv); + goto out_unlock; + } + + ret = __wait_ack(priv); + + if (ret) { + /* timeout, device will die soon */ + mutex_unlock(&priv->mutex); + return; + } + + /* check ack */ + ack = skb_dequeue(&priv->wq_acks); + if (!pskb_may_pull(ack, sizeof (*pkt_ack))) { + printk(KERN_ERR PFX "bad vcc action close ack\n"); + dev_kfree_skb(ack); + set_dying(priv); + goto out_unlock; + } + + pkt_ack = (struct fbxatm_remote_vcc_action_ack *)ack->data; + if (pkt_ack->ret) { + printk(KERN_ERR PFX "remote vcc close failed\n"); + dev_kfree_skb(ack); + set_dying(priv); + goto out_unlock; + } + +out_unlock: + mutex_unlock(&priv->mutex); +} + +/* + * common response for vcc action & send oam socket + */ +static void common_response(void *data, struct sk_buff *skb) +{ + struct driver_remote *priv; + + priv = (struct driver_remote *)data; + skb_queue_tail(&priv->wq_acks, skb); + priv->wq_res = 1; + wake_up(&priv->wq); +} + +/* + * create device procfs entries + */ +static int remote_init_procfs(struct fbxatm_dev *adev) +{ + return 0; +} + +/* + * release device procfs entries + */ +static void remote_release_procfs(struct fbxatm_dev *adev) +{ +} + +/* + * local fake fbxatm device callbacks + */ +static const struct fbxatm_dev_ops remote_fbxatm_ops = { + .open = remote_vcc_open, + .close = remote_vcc_close, + .send = remote_send, + .send_oam = remote_send_oam, + .init_procfs = remote_init_procfs, + .release_procfs = remote_release_procfs, + .owner = THIS_MODULE, +}; + +/* + * dev_rx_oam socket rx callback + */ +static int dev_rx_oam_deliver(void *data, struct sk_buff *skb, + struct sk_buff **ack) +{ + struct driver_remote *priv; + + priv = (struct driver_remote *)data; + skb_queue_tail(&priv->dev_oam_reqs, skb); + schedule_delayed_work(&priv->fsm_work, 0); + + return 0; +} + +/* + * dev_link socket rx callback + */ +static int dev_link_deliver(void *data, struct sk_buff *skb, + struct sk_buff **ack) +{ + struct driver_remote *priv; + + priv = (struct driver_remote *)data; + skb_queue_tail(&priv->dev_link_reqs, skb); + schedule_delayed_work(&priv->fsm_work, 0); + + /* send ack later */ + return 0; +} + +/* + * dev_connect socket tx ack callback + */ +static void dev_connect_response(void *data, struct sk_buff *skb) +{ + struct driver_remote *priv; + + priv = (struct driver_remote *)data; + skb_queue_tail(&priv->connect_acks, skb); + schedule_delayed_work(&priv->fsm_work, 0); +} + +/* + * handle link change queue + */ +static void handle_dev_link_queue(struct driver_remote *priv) +{ + struct sk_buff *skb; + + do { + struct fbxatm_remote_dev_link *pkt; + struct fbxatm_dev *adev; + struct sk_buff *ack; + + skb = skb_dequeue(&priv->dev_link_reqs); + if (!skb) + break; + + if (!pskb_may_pull(skb, sizeof (*pkt))) { + printk(KERN_ERR PFX "bad rx dev link\n"); + dev_kfree_skb(skb); + continue; + } + + pkt = (struct fbxatm_remote_dev_link *)skb->data; + + adev = priv->fbxatm_dev; + adev->link_rate_ds = ntohl(pkt->link_rate_ds); + adev->link_rate_us = ntohl(pkt->link_rate_us); + adev->link_cell_rate_ds = ntohl(pkt->link_cell_rate_ds); + adev->link_cell_rate_us = ntohl(pkt->link_cell_rate_us); + + if (pkt->link) + fbxatm_dev_set_link_up(adev); + else + fbxatm_dev_set_link_down(adev); + + /* send ack */ + ack = fbxatm_remote_alloc_skb(priv->remote_ctx, 0); + if (!ack) + continue; + fbxatm_remote_sock_send_ack(priv->dev_link_sock, ack); + + } while (1); +} + +/* + * handle oam rx queue + */ +static void handle_oam_rx_queue(struct driver_remote *priv) +{ + struct fbxatm_oam_cell *cell; + struct sk_buff *skb; + + do { + skb = skb_dequeue(&priv->dev_oam_reqs); + if (!skb) + break; + + cell = kmalloc(sizeof (*cell), GFP_KERNEL); + if (!cell) { + dev_kfree_skb(skb); + continue; + } + + if (!pskb_may_pull(skb, sizeof (cell->payload))) { + printk(KERN_ERR PFX "bad rx oam\n"); + kfree(cell); + dev_kfree_skb(skb); + continue; + } + + memcpy(&cell->payload, skb->data, sizeof (cell->payload)); + dev_kfree_skb(skb); + fbxatm_netifrx_oam(priv->fbxatm_dev, cell); + + } while (1); +} + +/* + * free all and set to dead state + */ +static void remote_free(struct driver_remote *priv) +{ + struct driver_remote_vcc *pvcc; + + if (priv->state == RSTATE_S_DEAD) + return; + + priv->want_die = 0; + + /* make sure remote_send device operation doesn't use sockets + * any more */ + spin_lock_bh(&priv->tx_lock); + priv->state = RSTATE_S_DEAD; + spin_unlock_bh(&priv->tx_lock); + + /* same goes for open_vcc, close_vcc and send_oam ops, + * RSTATE_S_DEAD will prevent function from being entered, and + * any sleeper will be woken up */ + wake_up(&priv->wq); + + mutex_lock(&priv->mutex); + + /* no vcc can be created, close all vcc sockets */ + list_for_each_entry(pvcc, &priv->pvcc_list, next) { + + if (pvcc->vcc_send_sock) { + fbxatm_remote_sock_close(pvcc->vcc_send_sock); + pvcc->vcc_send_sock = NULL; + } + + if (pvcc->vcc_rx_sock) { + fbxatm_remote_sock_close(pvcc->vcc_rx_sock); + pvcc->vcc_rx_sock = NULL; + } + + if (pvcc->vcc_qempty_sock) { + fbxatm_remote_sock_close(pvcc->vcc_qempty_sock); + pvcc->vcc_qempty_sock = NULL; + } + } + mutex_unlock(&priv->mutex); + + /* no external callback from fbxatm can use sockets now */ + + /* close all sockets */ + if (priv->dev_connect_sock) { + fbxatm_remote_sock_close(priv->dev_connect_sock); + priv->dev_connect_sock = NULL; + } + + if (priv->keepalive_sock) { + fbxatm_remote_sock_close(priv->keepalive_sock); + priv->keepalive_sock = NULL; + } + + if (priv->dev_link_sock) { + fbxatm_remote_sock_close(priv->dev_link_sock); + priv->keepalive_sock = NULL; + } + + if (priv->dev_rx_oam_sock) { + fbxatm_remote_sock_close(priv->dev_rx_oam_sock); + priv->dev_rx_oam_sock = NULL; + } + + if (priv->vcc_action_sock) { + fbxatm_remote_sock_close(priv->vcc_action_sock); + priv->vcc_action_sock = NULL; + } + + if (priv->dev_send_oam_sock) { + fbxatm_remote_sock_close(priv->dev_send_oam_sock); + priv->dev_send_oam_sock = NULL; + } + + if (priv->netdev) { + dev_put(priv->netdev); + priv->netdev = NULL; + } + + if (priv->remote_ctx) { + fbxatm_remote_free_ctx(priv->remote_ctx); + priv->remote_ctx = NULL; + } + + skb_queue_purge(&priv->connect_acks); + skb_queue_purge(&priv->dev_link_reqs); + skb_queue_purge(&priv->dev_oam_reqs); + skb_queue_purge(&priv->wq_acks); + + if (priv->fbxatm_dev_registered) { + fbxatm_dev_set_link_down(priv->fbxatm_dev); + printk(KERN_WARNING "%s: marking dead\n", + priv->fbxatm_dev->name); + } +} + +/* + * remote context timeout on any socket + */ +static void remote_sock_timeout(void *data) +{ + set_dying((struct driver_remote *)data); +} + +/* + * main workqueue to handle device fsm + */ +static void remote_fsm(struct work_struct *t) +{ + struct delayed_work *dwork; + struct driver_remote *priv; + struct net_device *netdev; + struct fbxatm_remote_sockaddr addr; + + dwork = container_of(t, struct delayed_work, work); + priv = container_of(dwork, struct driver_remote, fsm_work); + + if (priv->want_die) { + remote_free(priv); + /* let FSM restart if needed */ + } + + switch (priv->state) { + case RSTATE_S_WAIT_NETDEV: + { + struct fbxatm_remote_connect *pkt; + struct fbxatm_remote_ctx *ctx; + struct sk_buff *skb; + u32 session_id; + + netdev = dev_get_by_name(&init_net, priv->pd->netdev_name); + if (!netdev) { + /* netdev notifier will reschedule */ + return; + } + priv->netdev = netdev; + + /* got netdev, open remote context */ + get_random_bytes(&session_id, sizeof (session_id)); + ctx = fbxatm_remote_alloc_ctx(netdev, priv->pd->remote_mac, + session_id, + remote_sock_timeout, + priv); + if (!ctx) { + printk(KERN_ERR PFX "unable to allocate remote ctx\n"); + remote_free(priv); + return; + } + priv->remote_ctx = ctx; + + /* open rx sockets */ + memset(&addr, 0, sizeof (addr)); + addr.mtype = htonl(FBXATM_RMT_DEV_LINK); + addr.deliver = dev_link_deliver; + addr.priv = priv; + priv->dev_link_sock = fbxatm_remote_sock_bind(ctx, &addr, 1); + if (!priv->dev_link_sock) { + remote_free(priv); + return; + } + + memset(&addr, 0, sizeof (addr)); + addr.mtype = htonl(FBXATM_RMT_DEV_RX_OAM); + addr.deliver = dev_rx_oam_deliver; + addr.priv = priv; + priv->dev_rx_oam_sock = fbxatm_remote_sock_bind(ctx, &addr, 0); + if (!priv->dev_rx_oam_sock) { + remote_free(priv); + return; + } + + /* create socket for initial connexion */ + memset(&addr, 0, sizeof (addr)); + addr.mtype = htonl(FBXATM_RMT_CONNECT); + addr.response = dev_connect_response; + addr.priv = priv; + addr.infinite_retry = 1; + priv->dev_connect_sock = fbxatm_remote_sock_connect(ctx, + &addr, 1); + if (!priv->dev_connect_sock) { + remote_free(priv); + return; + } + + /* send the connect packet */ + skb = fbxatm_remote_alloc_skb(priv->remote_ctx, + sizeof (*pkt)); + if (!skb) { + remote_free(priv); + return; + } + + pkt = (struct fbxatm_remote_connect *) + skb_put(skb, sizeof (*pkt)); + + memcpy(pkt->name, priv->pd->remote_name, sizeof (pkt->name)); + + fbxatm_remote_sock_getaddr(priv->dev_link_sock, &addr); + pkt->dev_link_port = addr.lport; + + fbxatm_remote_sock_getaddr(priv->dev_rx_oam_sock, &addr); + pkt->dev_rx_oam_port = addr.lport; + + if (fbxatm_remote_sock_send(priv->dev_connect_sock, skb)) { + dev_kfree_skb(skb); + remote_free(priv); + return; + } + + /* wait for connect ack... */ + priv->state = RSTATE_S_WAIT_REMOTE; + break; + } + + case RSTATE_S_WAIT_REMOTE: + { + struct fbxatm_remote_connect_ack *pkt_ack; + struct fbxatm_remote_ctx *ctx; + struct fbxatm_dev *adev; + struct sk_buff *skb; + int ret; + + skb = skb_dequeue(&priv->connect_acks); + if (!skb) + return; + + if (!pskb_may_pull(skb, sizeof (*pkt_ack))) { + printk(KERN_ERR PFX "bad connect ack\n"); + dev_kfree_skb(skb); + return; + } + + pkt_ack = (struct fbxatm_remote_connect_ack *)skb->data; + ctx = priv->remote_ctx; + + /* open sockets */ + memset(&addr, 0, sizeof (addr)); + addr.mtype = htonl(FBXATM_RMT_VCC_ACTION); + addr.response = common_response; + addr.dport = pkt_ack->vcc_action_port; + addr.priv = priv; + priv->vcc_action_sock = fbxatm_remote_sock_connect(ctx, + &addr, 1); + if (!priv->vcc_action_sock) { + remote_free(priv); + return; + } + + memset(&addr, 0, sizeof (addr)); + addr.mtype = htonl(FBXATM_RMT_DEV_SEND_OAM); + addr.response = common_response; + addr.dport = pkt_ack->dev_send_oam_port; + addr.priv = priv; + priv->dev_send_oam_sock = fbxatm_remote_sock_connect(ctx, + &addr, 1); + if (!priv->dev_send_oam_sock) { + remote_free(priv); + return; + } + + memset(&addr, 0, sizeof (addr)); + addr.mtype = htonl(FBXATM_RMT_KEEPALIVE); + addr.priv = priv; + addr.dport = pkt_ack->keepalive_port; + priv->keepalive_sock = fbxatm_remote_sock_connect(ctx, + &addr, 1); + if (!priv->keepalive_sock) { + remote_free(priv); + return; + } + + /* all set, register fbxatm device */ + adev = priv->fbxatm_dev; + adev->max_vcc = ntohl(pkt_ack->max_vcc); + adev->vci_mask = ntohl(pkt_ack->vci_mask); + adev->vpi_mask = ntohl(pkt_ack->vpi_mask); + adev->max_priority = ntohl(pkt_ack->max_priority); + adev->max_rx_priority = ntohl(pkt_ack->max_rx_priority); + adev->link_rate_ds = ntohl(pkt_ack->link_rate_ds); + adev->link_rate_us = ntohl(pkt_ack->link_rate_us); + adev->link_cell_rate_ds = ntohl(pkt_ack->link_cell_rate_ds); + adev->link_cell_rate_us = ntohl(pkt_ack->link_cell_rate_us); + adev->tx_headroom = fbxatm_remote_headroom(ctx); + + /* register atm device */ + priv->state = RSTATE_S_ACTIVE; + + if (!priv->fbxatm_dev_registered) { + ret = fbxatm_register_device(adev, "remote_fbxatm", + &remote_fbxatm_ops); + if (ret) { + remote_free(priv); + return; + } + } + + priv->fbxatm_dev_registered = 1; + printk(KERN_INFO "%s: connected to %s - %pM6/%s\n", + adev->name, priv->pd->remote_name, + priv->pd->remote_mac, priv->netdev->name); + + if (pkt_ack->link) + fbxatm_dev_set_link_up(adev); + else + fbxatm_dev_set_link_down(adev); + + schedule_delayed_work(&priv->fsm_work, HZ); + break; + } + + case RSTATE_S_ACTIVE: + { + /* process link change event if any */ + handle_dev_link_queue(priv); + + /* process rx oam if any */ + handle_oam_rx_queue(priv); + + /* send keepalive */ + if (!fbxatm_remote_sock_pending(priv->keepalive_sock)) { + struct sk_buff *skb; + + skb = fbxatm_remote_alloc_skb(priv->remote_ctx, 0); + if (skb) + fbxatm_remote_sock_send(priv->keepalive_sock, + skb); + } + + schedule_delayed_work(&priv->fsm_work, HZ); + break; + } + + case RSTATE_S_DEAD: + /* wait until open vcc list is empty */ + if (!list_empty(&priv->pvcc_list)) + break; + + priv->state = RSTATE_S_WAIT_NETDEV; + if (priv->fbxatm_dev_registered) + printk(KERN_INFO "%s: reconnecting\n", + priv->fbxatm_dev->name); + schedule_delayed_work(&priv->fsm_work, HZ); + break; + } +} + +/* + * netdevice notifier callback + */ +static int remote_device_event(struct notifier_block *this, + unsigned long event, void *ptr) +{ + struct net_device *dev = (struct net_device *)ptr; + struct driver_remote *priv; + + spin_lock_bh(&remote_lock); + + /* go through remote list to check if device matches one */ + list_for_each_entry(priv, &remote_dev_list, next) { + + switch (event) { + case NETDEV_REGISTER: + if (strcmp(dev->name, priv->pd->netdev_name)) + continue; + break; + + case NETDEV_UNREGISTER: + if (dev != priv->netdev) + continue; + priv->want_die = 1; + break; + + default: + continue; + } + schedule_delayed_work(&priv->fsm_work, 0); + } + + spin_unlock_bh(&remote_lock); + + return 0; +} + +static struct notifier_block remote_notifier = { + .notifier_call = remote_device_event, +}; + +/* + * platform data probe callback + */ +static int __devinit remote_probe(struct platform_device *pdev) +{ + struct fbxatm_remote_pdata *pd; + struct driver_remote *priv; + struct fbxatm_dev *adev; + + pd = pdev->dev.platform_data; + if (!pd || !pd->netdev_name[0]) + return -EINVAL; + + /* allocate fbxatm device */ + adev = fbxatm_alloc_device(sizeof (*priv)); + if (!adev) + return -ENOMEM; + + priv = fbxatm_dev_priv(adev); + + priv->fbxatm_dev = adev; + INIT_LIST_HEAD(&priv->pvcc_list); + spin_lock_init(&priv->tx_lock); + mutex_init(&priv->mutex); + + priv->state = RSTATE_S_WAIT_NETDEV; + INIT_DELAYED_WORK(&priv->fsm_work, remote_fsm); + + skb_queue_head_init(&priv->connect_acks); + skb_queue_head_init(&priv->dev_link_reqs); + skb_queue_head_init(&priv->dev_oam_reqs); + init_waitqueue_head(&priv->wq); + skb_queue_head_init(&priv->wq_acks); + priv->pd = pd; + + spin_lock_bh(&remote_lock); + list_add_tail(&priv->next, &remote_dev_list); + spin_unlock_bh(&remote_lock); + + platform_set_drvdata(pdev, priv); + + printk(KERN_INFO PFX "connecting to %s - %pM6/%s\n", + priv->pd->remote_name, + priv->pd->remote_mac, + priv->pd->netdev_name); + + /* kick fsm */ + schedule_delayed_work(&priv->fsm_work, 0); + return 0; +} + +static int __devexit remote_remove(struct platform_device *pdev) +{ + struct driver_remote *priv; + struct fbxatm_dev *adev; + + priv = platform_get_drvdata(pdev); + adev = priv->fbxatm_dev; + + /* remove from global list so network notifier can't find us */ + spin_lock_bh(&remote_lock); + list_del(&priv->next); + spin_unlock_bh(&remote_lock); + + /* cancel any pending fsm */ + cancel_delayed_work_sync(&priv->fsm_work); + + /* force dead state */ + remote_free(priv); + + if (priv->fbxatm_dev_registered) + fbxatm_unregister_device(adev); + fbxatm_free_device(adev); + return 0; +} + +struct platform_driver fbxatm_remote_driver = { + .probe = remote_probe, + .remove = __devexit_p(remote_remove), + .driver = { + .name = "fbxatm_remote", + .owner = THIS_MODULE, + }, +}; + +static int __init fbxatm_remote_driver_init(void) +{ + int ret; + + INIT_LIST_HEAD(&remote_dev_list); + ret = fbxatm_remote_init(); + if (ret) + goto fail; + ret = register_netdevice_notifier(&remote_notifier); + if (ret) + goto fail_remote; + ret = platform_driver_register(&fbxatm_remote_driver); + if (ret) + goto fail_notifier; + return 0; + +fail_notifier: + unregister_netdevice_notifier(&remote_notifier); +fail_remote: + fbxatm_remote_exit(); +fail: + return ret; +} + +static void __exit fbxatm_remote_driver_exit(void) +{ + fbxatm_remote_exit(); + unregister_netdevice_notifier(&remote_notifier); + platform_driver_unregister(&fbxatm_remote_driver); +} + +module_init(fbxatm_remote_driver_init); +module_exit(fbxatm_remote_driver_exit); + +MODULE_LICENSE("GPL"); +MODULE_VERSION("1.0"); +MODULE_AUTHOR("Maxime Bizon "); diff -Nruw linux-3.6.7-fbx/net/fbxatm./fbxatm_remote_driver.h linux-3.6.7-fbx/net/fbxatm/fbxatm_remote_driver.h --- linux-3.6.7-fbx/net/fbxatm./fbxatm_remote_driver.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/fbxatm_remote_driver.h 2013-09-03 14:19:33.366106175 +0200 @@ -0,0 +1,79 @@ +#ifndef FBXATM_REMOTE_DRIVER_H_ +#define FBXATM_REMOTE_DRIVER_H_ + +#include +#include +#include +#include +#include + +enum remote_state { + RSTATE_S_WAIT_NETDEV = 0, + RSTATE_S_WAIT_REMOTE, + RSTATE_S_ACTIVE, + RSTATE_S_DEAD, +}; + +struct driver_remote; + +struct driver_remote_vcc { + + struct fbxatm_vcc *vcc; + struct driver_remote *priv; + + unsigned int remote_id; + + int tx_pending; + int tx_got_qempty; + + /* output */ + struct fbxatm_remote_sock *vcc_send_sock; + + /* input */ + struct fbxatm_remote_sock *vcc_rx_sock; + struct fbxatm_remote_sock *vcc_qempty_sock; + + struct list_head next; +}; + +struct driver_remote { + struct fbxatm_dev *fbxatm_dev; + int fbxatm_dev_registered; + + struct list_head pvcc_list; + + spinlock_t tx_lock; + struct mutex mutex; + + struct fbxatm_remote_ctx *remote_ctx; + struct net_device *netdev; + + enum remote_state state; + struct delayed_work fsm_work; + int want_die; + + /* output */ + struct fbxatm_remote_sock *dev_connect_sock; + struct sk_buff_head connect_acks; + + struct fbxatm_remote_sock *keepalive_sock; + + /* input */ + struct fbxatm_remote_sock *dev_link_sock; + struct sk_buff_head dev_link_reqs; + + struct fbxatm_remote_sock *dev_rx_oam_sock; + struct sk_buff_head dev_oam_reqs; + + /* used to wait for send_oam & vcc_action */ + struct fbxatm_remote_sock *vcc_action_sock; + struct fbxatm_remote_sock *dev_send_oam_sock; + wait_queue_head_t wq; + int wq_res; + struct sk_buff_head wq_acks; + + struct fbxatm_remote_pdata *pd; + struct list_head next; +}; + +#endif /* ! FBXATM_REMOTE_DRIVER_H_ */ diff -Nruw linux-3.6.7-fbx/net/fbxatm./fbxatm_sysfs.c linux-3.6.7-fbx/net/fbxatm/fbxatm_sysfs.c --- linux-3.6.7-fbx/net/fbxatm./fbxatm_sysfs.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/fbxatm_sysfs.c 2013-09-03 14:19:33.366106175 +0200 @@ -0,0 +1,154 @@ +#include +#include +#include +#include +#include +#include +#include "fbxatm_priv.h" + +#define to_fbxatm_dev(cldev) container_of(cldev, struct fbxatm_dev, dev) + +static ssize_t show_ifindex(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxatm_dev *adev = to_fbxatm_dev(dev); + return sprintf(buf, "%d\n", adev->ifindex); +} + +static ssize_t show_link_state(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxatm_dev *adev = to_fbxatm_dev(dev); + return sprintf(buf, "%d\n", + test_bit(FBXATM_DEV_F_LINK_UP, &adev->dev_flags) ? + 1 : 0); +} + +static ssize_t show_link_rate_us(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxatm_dev *adev = to_fbxatm_dev(dev); + return sprintf(buf, "%d\n", adev->link_rate_us); +} + +static ssize_t show_link_rate_ds(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxatm_dev *adev = to_fbxatm_dev(dev); + return sprintf(buf, "%d\n", adev->link_rate_ds); +} + +static ssize_t show_max_priority(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxatm_dev *adev = to_fbxatm_dev(dev); + return sprintf(buf, "%d\n", adev->max_priority); +} + +static ssize_t show_max_rx_priority(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxatm_dev *adev = to_fbxatm_dev(dev); + return sprintf(buf, "%d\n", adev->max_rx_priority); +} + +static DEVICE_ATTR(ifindex, S_IRUGO, show_ifindex, NULL); +static DEVICE_ATTR(link_state, S_IRUGO, show_link_state, NULL); +static DEVICE_ATTR(link_rate_us, S_IRUGO, show_link_rate_us, NULL); +static DEVICE_ATTR(link_rate_ds, S_IRUGO, show_link_rate_ds, NULL); +static DEVICE_ATTR(max_priority, S_IRUGO, show_max_priority, NULL); +static DEVICE_ATTR(max_rx_priority, S_IRUGO, show_max_rx_priority, NULL); + +static struct device_attribute *fbxatm_attrs[] = { + &dev_attr_ifindex, + &dev_attr_link_state, + &dev_attr_link_rate_us, + &dev_attr_link_rate_ds, + &dev_attr_max_priority, + &dev_attr_max_rx_priority, +}; + +static int fbxatm_uevent(struct device *dev, struct kobj_uevent_env *env) +{ + struct fbxatm_dev *adev; + + if (!dev) + return -ENODEV; + + adev = to_fbxatm_dev(dev); + if (!adev) + return -ENODEV; + + if (add_uevent_var(env, "NAME=%s", adev->name)) + return -ENOMEM; + + if (add_uevent_var(env, "IFINDEX=%u", adev->ifindex)) + return -ENOMEM; + + if (add_uevent_var(env, "LINK=%u", + test_bit(FBXATM_DEV_F_LINK_UP, &adev->dev_flags) ? + 1 : 0)) + return -ENOMEM; + + return 0; +} + +static void fbxatm_release(struct device *dev) +{ + struct fbxatm_dev *adev = to_fbxatm_dev(dev); + __fbxatm_free_device(adev); +} + +static struct class fbxatm_class = { + .name = "fbxatm", + .dev_release = fbxatm_release, + .dev_uevent = fbxatm_uevent, +}; + +void fbxatm_dev_change_sysfs(struct fbxatm_dev *adev) +{ + struct device *dev = &adev->dev; + + kobject_uevent_env(&dev->kobj, KOBJ_CHANGE, NULL); +} + +int fbxatm_register_dev_sysfs(struct fbxatm_dev *adev) +{ + struct device *dev = &adev->dev; + int i, j, ret; + + dev->class = &fbxatm_class; + dev_set_name(dev, "%s", adev->name); + ret = device_register(dev); + if (ret < 0) + return ret; + + for (i = 0; i < ARRAY_SIZE(fbxatm_attrs); i++) { + ret = device_create_file(dev, fbxatm_attrs[i]); + if (ret) + goto err; + } + return 0; + +err: + for (j = 0; j < i; j++) + device_remove_file(dev, fbxatm_attrs[j]); + device_del(dev); + return ret; +} + +void fbxatm_unregister_dev_sysfs(struct fbxatm_dev *adev) +{ + struct device *dev = &adev->dev; + device_del(dev); +} + +int __init fbxatm_sysfs_init(void) +{ + return class_register(&fbxatm_class); +} + +void fbxatm_sysfs_exit(void) +{ + class_unregister(&fbxatm_class); +} diff -Nruw linux-3.6.7-fbx/net/fbxatm./Kconfig linux-3.6.7-fbx/net/fbxatm/Kconfig --- linux-3.6.7-fbx/net/fbxatm./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/Kconfig 2013-09-03 14:19:33.366106175 +0200 @@ -0,0 +1,28 @@ +menuconfig FBXATM + tristate "Freebox Asynchronous Transfer Mode (ATM)" + +if FBXATM + +config FBXATM_REMOTE + bool + +choice + prompt "mode" + default FBXATM_STACK + +config FBXATM_STACK + bool "standard" + +config FBXATM_REMOTE_STUB + bool "remote stub" + select FBXATM_REMOTE + +endchoice + +config FBXATM_REMOTE_DRIVER + tristate "remote fbxatm driver" + depends on FBXATM_STACK + select FBXATM_REMOTE + default n + +endif diff -Nruw linux-3.6.7-fbx/net/fbxatm./Makefile linux-3.6.7-fbx/net/fbxatm/Makefile --- linux-3.6.7-fbx/net/fbxatm./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxatm/Makefile 2013-09-03 14:19:33.366106175 +0200 @@ -0,0 +1,18 @@ +obj-$(CONFIG_FBXATM) += fbxatm.o +obj-$(CONFIG_FBXATM_REMOTE) += fbxatm_remote.o + +fbxatm-y := fbxatm_procfs.o fbxatm_sysfs.o + +ifeq ($(CONFIG_FBXATM_STACK),y) +fbxatm-y += fbxatm_core.o \ + fbxatm_2684.o \ + fbxatm_dev.o \ + crc10.o +fbxatm-$(CONFIG_PPP) += fbxatm_pppoa.o +endif + +ifeq ($(CONFIG_FBXATM_REMOTE_STUB),y) +fbxatm-y += fbxatm_remote_stub.o +endif + +obj-$(CONFIG_FBXATM_REMOTE_DRIVER) += fbxatm_remote_driver.o diff -Nruw linux-3.6.7-fbx/net/fbxbridge./Kconfig linux-3.6.7-fbx/net/fbxbridge/Kconfig --- linux-3.6.7-fbx/net/fbxbridge./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/net/fbxbridge/Kconfig 2014-04-17 17:00:38.234938395 +0200 @@ -0,0 +1,7 @@ + +# +# Freebox bridge +# +config FBXBRIDGE + tristate "Freebox Bridge" + depends on FREEBOX_SERIALINFO --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/net/ipv4/ip_ffn.c 2014-04-17 16:28:43.977686626 +0200 @@ -0,0 +1,671 @@ +/* + * IP fast forwarding and NAT + * + * Very restrictive code, that only cope non fragmented UDP and TCP + * packets, that are routed and NATed with no other modification. + * + * Provide a fast path for established conntrack entries so that + * packets go out ASAP. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define FFN_CACHE_SIZE 128 +#define MAX_FFN_ENTRY 512 + +struct ffn_data { + u8 new_tos; + u32 new_sip; + u32 new_dip; + u16 new_sport; + u16 new_dport; + int force_skb_prio : 1; + int alter : 1; + int tos_change : 1; + unsigned int new_skb_prio; + u32 new_mark; + struct dst_entry *dst; + struct nf_conn *ct; + enum ip_conntrack_info ctinfo; +}; + +struct ffn_lookup_entry { + int added_when; + u32 sip; + u32 dip; + u16 sport; + u16 dport; + u8 protocol; +#ifdef CONFIG_IP_FFN_PROCFS + uint64_t forwarded_bytes; + uint32_t forwarded_packets; +#endif + struct list_head next; + struct ffn_data manip; + struct list_head all_next; +}; + +static DEFINE_SPINLOCK(ffn_lock); +static struct list_head ffn_cache[FFN_CACHE_SIZE]; +static struct list_head ffn_all; +static unsigned int ffn_entry_count; + +/* + * hash on five parameter + */ +static inline unsigned int ffn_hash(u32 sip, u32 dip, u16 sport, u16 dport, + int is_tcp) +{ + return jhash_3words(sip, is_tcp ? dip : ~dip, sport | dport << 16, 0); +} + +/* + * attempt to find entry with given value in cache + */ +static struct ffn_lookup_entry *__ffn_find(u32 sip, u32 dip, + u16 sport, u16 dport, + u8 protocol, + unsigned int hash) +{ + struct ffn_lookup_entry *tmp; + + list_for_each_entry(tmp, &ffn_cache[hash % FFN_CACHE_SIZE], next) { + + /* compare entry */ + if (tmp->sip == sip && tmp->dip == dip && + tmp->sport == sport && tmp->dport == dport && + tmp->protocol == protocol) + return tmp; + } + return NULL; +} + +static struct ffn_lookup_entry *__ffn_get(u32 sip, u32 dip, + u16 sport, u16 dport, + int is_tcp) +{ + unsigned int hash; + u8 protocol; + + /* lookup entry in cache */ + protocol = (is_tcp) ? IPPROTO_TCP : IPPROTO_UDP; + hash = ffn_hash(sip, dip, sport, dport, is_tcp); + return __ffn_find(sip, dip, sport, dport, protocol, hash); +} + +static void __ffn_remove_entry(struct ffn_lookup_entry *e) +{ + list_del(&e->next); + list_del(&e->all_next); + ffn_entry_count--; + dst_release(e->manip.dst); + kfree(e); +} + +static int __ffn_add_entry(struct ffn_lookup_entry *e, + u8 proto, unsigned int hash) +{ + /* make sure it's not present */ + if (__ffn_find(e->sip, e->dip, e->sport, e->dport, proto, hash)) + return 1; + + if (ffn_entry_count >= MAX_FFN_ENTRY) + return 1; + + /* add new entry */ + list_add_tail(&e->next, &ffn_cache[hash % FFN_CACHE_SIZE]); + list_add_tail(&e->all_next, &ffn_all); + ffn_entry_count++; + return 0; +} + +/* + * helper to recompute checksum + */ +static inline u16 recheck4(u32 oldvalinv, u32 newval, + u32 oldvalinv2, u32 newval2, + u32 oldvalinv3, u32 newval3, + u32 oldvalinv4, u32 newval4, + u16 oldcheck) +{ + u32 diffs[] = { oldvalinv, newval, oldvalinv2, newval2, + oldvalinv3, newval3, + oldvalinv4, newval4 }; + + return csum_fold(csum_partial((char *)diffs, sizeof (diffs), + oldcheck ^ 0xFFFF)); +} + +static inline __sum16 tcp_v4_check(int len, __be32 saddr, + __be32 daddr, __wsum base) +{ + return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_TCP, base); +} + +/* + * two hooks into netfilter code + */ +extern int external_tcpv4_packet(struct nf_conn *ct, + const struct sk_buff *skb, + unsigned int dataoff, + enum ip_conntrack_info ctinfo); + +extern int external_udpv4_packet(struct nf_conn *ct, + const struct sk_buff *skb, + unsigned int dataoff, + enum ip_conntrack_info ctinfo); + +extern int ip_local_deliver_finish(struct sk_buff *skb); + +/* + * check if packet is in ffn cache, or mark it if it can be added + * later + */ +int ip_ffn_process(struct sk_buff *skb) +{ + struct ffn_lookup_entry *e; + struct nf_conntrack *nfct; + struct iphdr *iph; + struct tcphdr *tcph = NULL; + struct udphdr *udph = NULL; + u16 tcheck; + u8 proto; + int res; + + iph = ip_hdr(skb); + + /* refuse fragmented IP packet, or packets with IP options */ + if (iph->ihl > 5 || (iph->frag_off & htons(IP_MF | IP_OFFSET))) + goto not_ffnable; + + /* refuse fragmented IP packet */ + if (iph->frag_off & htons(IP_MF | IP_OFFSET)) + goto not_ffnable; + + /* check encapsulated protocol is udp or tcp */ + if (iph->protocol != IPPROTO_TCP && iph->protocol != IPPROTO_UDP) + goto not_ffnable; + + if (iph->ttl <= 1) + goto not_ffnable; + + proto = iph->protocol; + if (proto == IPPROTO_TCP) { + if (skb_headlen(skb) < (iph->ihl * 4) + sizeof (struct tcphdr)) + goto not_ffnable; + tcph = (struct tcphdr *)((unsigned char *)iph + + (iph->ihl * 4)); + + if (tcph->doff * 4 < sizeof (struct tcphdr) || + skb_headlen(skb) < iph->ihl * 4 + tcph->doff * 4) + goto not_ffnable; + + spin_lock_bh(&ffn_lock); + e = __ffn_get(iph->saddr, iph->daddr, tcph->source, + tcph->dest, 1); + } else { + + if (skb_headlen(skb) < (iph->ihl * 4) + sizeof (struct udphdr)) + goto not_ffnable; + udph = (struct udphdr *)((unsigned char *)iph + + (iph->ihl * 4)); + spin_lock_bh(&ffn_lock); + e = __ffn_get(iph->saddr, iph->daddr, udph->source, + udph->dest, 0); + } + + if (!e) { + spin_unlock_bh(&ffn_lock); + goto ffnable; + } + + if (e->manip.dst->obsolete > 0) { + __ffn_remove_entry(e); + spin_unlock_bh(&ffn_lock); + goto ffnable; + } + + nfct = &e->manip.ct->ct_general; + nf_conntrack_get(nfct); + + if (proto == IPPROTO_TCP) { + /* do sequence number checking and update + * conntrack info */ + res = external_tcpv4_packet(e->manip.ct, skb, iph->ihl * 4, + e->manip.ctinfo); + tcheck = tcph->check; + } else { + res = external_udpv4_packet(e->manip.ct, skb, iph->ihl * 4, + e->manip.ctinfo); + tcheck = udph->check; + } + + if (unlikely(res != NF_ACCEPT)) { + /* packet rejected by conntrack, unless asked to drop, + * send it back into kernel */ + spin_unlock_bh(&ffn_lock); + nf_conntrack_put(nfct); + + if (res == NF_DROP) { + dev_kfree_skb(skb); + return 0; + } + + goto ffnable; + } + + if (!e->manip.alter) + goto fix_ip_hdr; + + if (skb->ip_summed != CHECKSUM_PARTIAL) { + /* fix ports & transport protocol checksum */ + if (proto == IPPROTO_TCP) { + tcheck = recheck4(~iph->saddr, e->manip.new_sip, + ~iph->daddr, e->manip.new_dip, + tcph->source ^ 0xFFFF, + e->manip.new_sport, + tcph->dest ^ 0xFFFF, + e->manip.new_dport, + tcheck); + tcph->source = e->manip.new_sport; + tcph->dest = e->manip.new_dport; + tcph->check = tcheck; + } else { + tcheck = recheck4(~iph->saddr, e->manip.new_sip, + ~iph->daddr, e->manip.new_dip, + udph->source ^ 0xFFFF, + e->manip.new_sport, + udph->dest ^ 0xFFFF, + e->manip.new_dport, + tcheck); + udph->source = e->manip.new_sport; + udph->dest = e->manip.new_dport; + if (udph->check) + udph->check = tcheck ? tcheck : 0xffff; + } + + } else { + unsigned int len; + + /* + * assume tcph->check only covers ip pseudo header, so + * don't update checksum wrt port change + * + * we might check skb->csum_offset to confirm that + * this is a valid assertion + */ + if (proto == IPPROTO_TCP) { + len = skb->len - ((void *)tcph - (void *)iph); + tcheck = ~csum_tcpudp_magic(e->manip.new_sip, + e->manip.new_dip, + len, IPPROTO_TCP, 0); + tcph->check = tcheck; + tcph->source = e->manip.new_sport; + tcph->dest = e->manip.new_dport; + } else { + len = skb->len - ((void *)udph - (void *)iph); + if (udph->check) { + tcheck = ~csum_tcpudp_magic(e->manip.new_sip, + e->manip.new_dip, + len, + IPPROTO_UDP, 0); + udph->check = tcheck ? tcheck : 0xffff; + } + udph->source = e->manip.new_sport; + udph->dest = e->manip.new_dport; + } + } + +fix_ip_hdr: + /* update IP header field */ + iph->ttl--; + iph->saddr = e->manip.new_sip; + iph->daddr = e->manip.new_dip; + + if (e->manip.tos_change) + iph->tos = e->manip.new_tos; + + iph->check = 0; + iph->check = ip_fast_csum((u8 *)iph, 5); + + /* forward skb */ + if (e->manip.force_skb_prio) + skb->priority = e->manip.new_skb_prio; + else + skb->priority = rt_tos2priority(iph->tos); + + skb->mark = e->manip.new_mark; + +#ifdef CONFIG_IP_FFN_PROCFS + e->forwarded_packets++; + e->forwarded_bytes += skb->len; +#endif + + skb_dst_set(skb, dst_clone(e->manip.dst)); + spin_unlock_bh(&ffn_lock); + + if (nfct == skb->nfct) { + /* + * skbs to/from localhost will have the conntrack + * already set, don't leak references here. + */ + nf_conntrack_put(nfct); + } else { + if (unlikely(skb->nfct != NULL)) { + /* + * conntrack is not NULL here and it is not + * the same as the one we have in the + * ffn_entry, this shoud not happen, warn once + * and switch to slow path. + */ + WARN_ONCE(skb->nfct != NULL, + "weird skb->nfct %p, NULL was expected\n", + skb->nfct); + printk_once(KERN_WARNING "ffn entry:\n" + " added_when: %i\n" + " sip: %pI4 -> %pI4\n" + " dip: %pI4 -> %pI4\n" + " sport: %u -> %u\n" + " dport: %u -> %u\n", + e->added_when, + &e->sip, &e->manip.new_sip, + &e->dip, &e->manip.new_dip, + htons(e->sport), htons(e->manip.new_sport), + htons(e->dport), htons(e->manip.new_dport)); + goto not_ffnable; + } + skb->nfct = nfct; + skb->nfctinfo = e->manip.ctinfo; + } + + skb->ffn_state = FFN_STATE_FAST_FORWARDED; + if (e->added_when == IP_FFN_FINISH_OUT) + dst_output(skb); + else + ip_local_deliver_finish(skb); + + return 0; + +ffnable: + skb->ffn_state = FFN_STATE_FORWARDABLE; + skb->ffn_orig_tos = iph->tos; + return 1; + +not_ffnable: + skb->ffn_state = FFN_STATE_INCOMPATIBLE; + return 1; +} + +/* + * check if skb is candidate for ffn, and if so add it to ffn cache + * + * called after post routing + */ +void ip_ffn_add(struct sk_buff *skb, int when) +{ + struct nf_conn *ct; + struct nf_conntrack_tuple *tuple, *rtuple; + enum ip_conntrack_info ctinfo; + struct ffn_lookup_entry *e; + struct iphdr *iph; + unsigned int hash; + int dir; + u8 proto; + + if (ffn_entry_count >= MAX_FFN_ENTRY) + return; + + iph = ip_hdr(skb); + + if (!skb->nfct || (skb_dst(skb)->output != ip_output && + when == IP_FFN_FINISH_OUT)) + return; + + ct = nf_ct_get(skb, &ctinfo); + if ((ctinfo != IP_CT_ESTABLISHED) && + (ctinfo != IP_CT_ESTABLISHED + IP_CT_IS_REPLY)) + return; + + if (nfct_help(ct)) + return; + + dir = (ctinfo == IP_CT_ESTABLISHED) ? + IP_CT_DIR_ORIGINAL : IP_CT_DIR_REPLY; + tuple = &ct->tuplehash[dir].tuple; + + if (tuple->dst.protonum != IPPROTO_TCP && + tuple->dst.protonum != IPPROTO_UDP) + return; + + rtuple = &ct->tuplehash[1 - dir].tuple; + + e = kmalloc(sizeof (*e), GFP_ATOMIC); + if (!e) + return; + + e->added_when = when; + e->sip = tuple->src.u3.ip; + e->dip = tuple->dst.u3.ip; + e->sport = tuple->src.u.all; + e->dport = tuple->dst.u.all; + e->protocol = tuple->dst.protonum; + +#ifdef CONFIG_IP_FFN_PROCFS + e->forwarded_packets = 0; + e->forwarded_bytes = 0; +#endif + + e->manip.new_sip = rtuple->dst.u3.ip; + e->manip.new_dip = rtuple->src.u3.ip; + e->manip.new_sport = rtuple->dst.u.all; + e->manip.new_dport = rtuple->src.u.all; + + if (e->manip.new_sip == e->sip && + e->manip.new_dip == e->dip && + e->manip.new_sport == e->sport && + e->manip.new_dport == e->dport) + e->manip.alter = 0; + else + e->manip.alter = 1; + + if (skb->ffn_orig_tos != iph->tos) { + e->manip.tos_change = 1; + e->manip.new_tos = iph->tos; + } else + e->manip.tos_change = 0; + + if (skb->priority != rt_tos2priority(iph->tos)) { + e->manip.force_skb_prio = 1; + e->manip.new_skb_prio = skb->priority; + } else + e->manip.force_skb_prio = 0; + + e->manip.new_mark = skb->mark; + e->manip.dst = skb_dst(skb); + dst_hold(e->manip.dst); + e->manip.ct = ct; + e->manip.ctinfo = ctinfo; + + hash = ffn_hash(e->sip, e->dip, e->sport, e->dport, + e->protocol == IPPROTO_TCP); + proto = (e->protocol == IPPROTO_TCP) ? IPPROTO_TCP : IPPROTO_UDP; + + spin_lock_bh(&ffn_lock); + if (__ffn_add_entry(e, proto, hash)) { + spin_unlock_bh(&ffn_lock); + dst_release(e->manip.dst); + kfree(e); + return; + } + spin_unlock_bh(&ffn_lock); +} + +/* + * netfilter callback when conntrack is about to be destroyed + */ +void ip_ffn_ct_destroy(struct nf_conn *ct) +{ + struct nf_conntrack_tuple *tuple; + struct ffn_lookup_entry *e; + int dir; + + /* locate all entry that use this conntrack */ + for (dir = 0; dir < 2; dir++) { + tuple = &ct->tuplehash[dir].tuple; + + if (tuple->dst.protonum != IPPROTO_TCP && + tuple->dst.protonum != IPPROTO_UDP) + return; + + spin_lock_bh(&ffn_lock); + e = __ffn_get(tuple->src.u3.ip, tuple->dst.u3.ip, + tuple->src.u.all, tuple->dst.u.all, + tuple->dst.protonum == IPPROTO_TCP); + if (e) + __ffn_remove_entry(e); + spin_unlock_bh(&ffn_lock); + } +} + +/* + * initialize ffn cache data + */ +static void __ip_ffn_init_cache(void) +{ + int i; + + for (i = 0; i < FFN_CACHE_SIZE; i++) + INIT_LIST_HEAD(&ffn_cache[i]); + INIT_LIST_HEAD(&ffn_all); + ffn_entry_count = 0; +} + +/* + * flush all ffn cache + */ +void ip_ffn_flush_all(void) +{ + struct ffn_lookup_entry *e, *tmp; + + spin_lock_bh(&ffn_lock); + list_for_each_entry_safe(e, tmp, &ffn_all, all_next) + __ffn_remove_entry(e); + __ip_ffn_init_cache(); + spin_unlock_bh(&ffn_lock); +} + +#ifdef CONFIG_IP_FFN_PROCFS +struct proc_dir_entry *proc_net_ip_ffn; + +static int ip_ffn_entries_show(struct seq_file *m, void *v) +{ + int i; + + spin_lock_bh(&ffn_lock); + + for (i = 0; i < FFN_CACHE_SIZE; ++i) { + struct ffn_lookup_entry *e; + + if (list_empty(&ffn_cache[i])) + continue; + + seq_printf(m, "Bucket %i:\n", i); + list_for_each_entry (e, &ffn_cache[i], next) { + seq_printf(m, " Protocol: "); + switch (e->protocol) { + case IPPROTO_TCP: + seq_printf(m, "TCPv4\n"); + break; + case IPPROTO_UDP: + seq_printf(m, "UDPv4\n"); + break; + default: + seq_printf(m, "ipproto_%i\n", e->protocol); + break; + } + seq_printf(m, " Original flow: %pI4:%u -> %pI4:%u\n", + &e->sip, + ntohs(e->sport), + &e->dip, + ntohs(e->dport)); + + if (e->sip != e->manip.new_sip || + e->dip != e->manip.new_dip || + e->sport != e->manip.new_sport || + e->dport != e->manip.new_dport) { + seq_printf(m, + " Modified flow: %pI4:%u -> " + "%pI4:%u\n", + &e->manip.new_sip, + ntohs(e->manip.new_sport), + &e->manip.new_dip, + ntohs(e->manip.new_dport)); + } + + seq_printf(m, " Forwarded packets: %u\n", + e->forwarded_packets); + seq_printf(m, " Forwarded bytes: %llu\n", + e->forwarded_bytes); + seq_printf(m, "\n"); + } + } + + spin_unlock_bh(&ffn_lock); + return 0; +} + +static int ip_ffn_entries_open(struct inode *inode, struct file *file) +{ + return single_open(file, ip_ffn_entries_show, NULL); +} + +static const struct file_operations ip_ffn_entries_fops = { + .owner = THIS_MODULE, + .open = ip_ffn_entries_open, + .release = single_release, + .read = seq_read, + .llseek = seq_lseek, +}; + + +static int __init __ip_ffn_init_procfs(void) +{ + proc_net_ip_ffn = proc_net_mkdir(&init_net, "ip_ffn", + init_net.proc_net); + if (!proc_net_ip_ffn) { + printk(KERN_ERR "proc_mkdir() has failed for 'net/ip_ffn'.\n"); + return -1; + } + + if (proc_create("entries", 0400, proc_net_ip_ffn, + &ip_ffn_entries_fops) == NULL) { + printk(KERN_ERR "proc_create() has failed for " + "'net/ip_ffn/entries'.\n"); + return -1; + } + return 0; +} +#endif + +/* + * initialize ffn + */ +void __init ip_ffn_init(void) +{ + printk("IP Fast Forward and NAT enabled\n"); + __ip_ffn_init_cache(); + +#ifdef CONFIG_IP_FFN_PROCFS + if (__ip_ffn_init_procfs() < 0) + printk(KERN_WARNING "IP FFN: unable to create proc entries.\n"); +#endif +} diff -Nruw linux-3.6.7-fbx/security/fbxlsmjail./Kconfig linux-3.6.7-fbx/security/fbxlsmjail/Kconfig --- linux-3.6.7-fbx/security/fbxlsmjail./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/security/fbxlsmjail/Kconfig 2013-09-03 14:19:33.374106328 +0200 @@ -0,0 +1,7 @@ +config SECURITY_FBXLSMJAIL + bool "Freebox jail Support" + depends on SECURITY + default n + help + This selects Freebox jailing LSM. + diff -Nruw linux-3.6.7-fbx/security/fbxlsmjail./Makefile linux-3.6.7-fbx/security/fbxlsmjail/Makefile --- linux-3.6.7-fbx/security/fbxlsmjail./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-3.6.7-fbx/security/fbxlsmjail/Makefile 2013-09-03 14:19:33.374106328 +0200 @@ -0,0 +1,2 @@ + +obj-$(CONFIG_SECURITY_FBXLSMJAIL) += fbxlsmjail.o --- /dev/null 2014-02-12 22:58:35.405035078 +0100 +++ linux-3.6.7-fbx/sound/soc/kirkwood/kirkwood-fbxgw2r.c 2014-04-17 16:28:45.117708584 +0200 @@ -0,0 +1,244 @@ +/* + * kirkwood-fbxgw2r.c + * + * Modified-from: kirkwood-rd88f6282a.c, which was before + * Modified-from: kirkwood-openrd.c + * Which is: + * (c) 2010 Arnaud Patard + * (c) 2010 Arnaud Patard + * + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include "../codecs/cs42l52.h" + +#if 0 +static void dump_registers(struct snd_soc_codec *codec) +{ + int i; + + for (i = 0; i < 0x40; ++i) { + printk("%02x: %02x\n", i, codec->read(codec, i)); + } +} +#endif + +static int fbxgw2r_dai_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_codec *codec = rtd->codec; + u8 reg; + +#if 0 + printk("Default register configuration:\n"); + dump_registers(codec); +#endif + + /* + * make sure we correctly transition from speaker to headphone + * and vice&versa. + */ + codec->write(codec, 0x4, 0x05); + + /* + * select input4a/input4b for capture + */ + reg = codec->read(codec, 0x8); + reg &= ~(7 << 5); + reg |= (3 << 5); + codec->write(codec, 0x8, reg); + + reg = codec->read(codec, 0x9); + reg &= ~(7 << 5); + reg |= (3 << 5); + codec->write(codec, 0x9, reg); + + /* + * set headphone analog gain to 1.000 + */ + reg = codec->read(codec, 0x0d); + reg &= ~0xe0; + reg |= 0xc0; + codec->write(codec, 0x0d, reg); + + return 0; +} + +static int fbxgw2r_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + unsigned int fmt; + int freq = 0; + + fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS; + ret = snd_soc_dai_set_fmt(cpu_dai, fmt); + if (ret < 0) + return ret; + ret = snd_soc_dai_set_fmt(codec_dai, fmt); + if (ret < 0) + return ret; + + + switch (params_rate(params)) { + default: + case 44100: + freq = 11289600; + break; + case 96000: + case 48000: + freq = 12288000; + break; + } + + return snd_soc_dai_set_sysclk(codec_dai, 0, freq, SND_SOC_CLOCK_IN); +} + +static int fbxgw2r_startup(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_codec *codec = rtd->codec_dai->codec; + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { + u8 reg; + + /* + * power up ADC A & B + */ + reg = snd_soc_read(codec, 0x2); + reg &= ~(3 << 1); + snd_soc_write(codec, 0x2, reg); + + /* + * unmute ADC A mixer volume + */ + reg = snd_soc_read(codec, 0x18); + reg &= ~(1 << 7); + snd_soc_write(codec, 0x18, reg); + + /* + * unmute ADC B mixer volume + */ + reg = snd_soc_read(codec, 0x19); + reg &= ~(1 << 7); + snd_soc_write(codec, 0x19, reg); + } + +#if 0 + dump_registers(codec); +#endif + return 0; +} + +static void fbxgw2r_shutdown(struct snd_pcm_substream *substream) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_codec *codec = rtd->codec_dai->codec; + + if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) { + u8 reg; + + /* + * power down ADC A & B + */ + reg = snd_soc_read(codec, 0x2); + reg |= (3 << 1); + snd_soc_write(codec, 0x2, reg); + + /* + * mute ADC A mixer volume + */ + reg = snd_soc_read(codec, 0x18); + reg |= (1 << 7); + snd_soc_write(codec, 0x18, reg); + + /* + * mute ADC B mixer volume + */ + reg = snd_soc_read(codec, 0x19); + reg |= (1 << 7); + snd_soc_write(codec, 0x19, reg); + } +} + +static struct snd_soc_ops fbxgw2r_ops = { + .hw_params = fbxgw2r_hw_params, + .startup = fbxgw2r_startup, + .shutdown = fbxgw2r_shutdown, +}; + +static struct snd_soc_dai_link fbxgw2r_dai[] = { + { + .name = "CS42L52", + .stream_name = "CS42L52 HiFi", + .cpu_dai_name = "kirkwood-i2s", + .platform_name = "kirkwood-pcm-audio", + .codec_dai_name = "cs42l52", + .codec_name = "cs42l52.1-004a", + .ops = &fbxgw2r_ops, + .init = fbxgw2r_dai_init, + }, +}; + + +static struct snd_soc_card fbxgw2r = { + .name = "FBXGW2R", + .dai_link = fbxgw2r_dai, + .num_links = ARRAY_SIZE(fbxgw2r_dai), +}; + +static int __devinit fbxgw2r_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &fbxgw2r; + + card->dev = &pdev->dev; + return snd_soc_register_card(card); +} + +static int __devexit fbxgw2r_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + + return snd_soc_unregister_card(card); +} + +struct platform_driver fbxgw2r_driver = { + .driver = { + .name = "fbxgw2r-audio", + .owner = THIS_MODULE, + }, + .probe = fbxgw2r_probe, + .remove = __devexit_p(fbxgw2r_remove), +}; + +static int __init fbxgw2r_init(void) +{ + return platform_driver_register(&fbxgw2r_driver); +} + +static void __exit fbxgw2r_exit(void) +{ + platform_driver_unregister(&fbxgw2r_driver); +} + +module_init(fbxgw2r_init); +module_exit(fbxgw2r_exit); + +/* Module information */ +MODULE_DESCRIPTION("ALSA SoC FBXGW2R Client"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:soc-audio");