Ticket #2418: 7362.06.00-7320.06.01.diff

Datei 7362.06.00-7320.06.01.diff, 146.6 KB (hinzugefügt von oliver, vor 4 Jahren)
  • .6.32/.config

    diff -burN 7362_linux-2.6.32/.config 7320_linux-2.6.32/.config
    old new  
    11# 
    22# Automatically generated make config: don't edit 
    33# Linux kernel version: 2.6.32.60 
    4 # Mon Oct  7 12:14:51 2013 
     4# Tue Sep  3 19:12:42 2013 
    55# 
    66CONFIG_MIPS=y 
    77 
     
    5858# CONFIG_MACH_QCA955x is not set 
    5959# CONFIG_MACH_HORNET is not set 
    6060# CONFIG_DANUBE is not set 
    61 CONFIG_IFX_DMA_DESCRIPTOR_NUMBER=128 
     61CONFIG_IFX_DMA_DESCRIPTOR_NUMBER=64 
    6262CONFIG_NAPI_ENABLED=y 
    6363# CONFIG_DMA_HW_POLL_DISABLED is not set 
    6464# CONFIG_AMAZON_SE is not set 
    65 # CONFIG_AR9 is not set 
    66 CONFIG_IFX_CLOCK_CHANGE=y 
    67 CONFIG_VR9=y 
     65CONFIG_AR9=y 
    6866 
    6967# 
    70 # VR9 Boards 
     68# AR9 Boards 
    7169# 
    72 # CONFIG_VR9_REF_BOARD is not set 
    73 CONFIG_VR9_AVM_FRITZ_BOX=y 
    74 # CONFIG_LTQ_RT288 is not set 
     70# CONFIG_AR9_REF_BOARD is not set 
     71# CONFIG_AR9_CUSTOM_BOARD is not set 
     72CONFIG_AR9_AVM_FRITZ_BOX=y 
     73# CONFIG_IFX_GW188 is not set 
     74# CONFIG_LTQ_VB300 is not set 
    7575 
    7676# 
    7777# Extra Configuration 
    7878# 
    79 CONFIG_DMA_PACKET_ARBITRATION_ENABLED=y 
    80 # CONFIG_GRX_25M_MODEL is not set 
     79CONFIG_IFX_CLOCK_CHANGE=y 
     80# CONFIG_VR9 is not set 
    8181# CONFIG_HN1 is not set 
    8282# CONFIG_AR10 is not set 
    83 CONFIG_AR9VR9_C55_MEMORY_SIZE=0x0 
    84 CONFIG_AR9VR9_C55_MEMORY_START=0x0 
     83CONFIG_AR9VR9_C55_MEMORY_SIZE=0x80 
     84CONFIG_AR9VR9_C55_MEMORY_START=0xFC0000 
    8585# CONFIG_AR9VR9_AVM_CPUFREQ is not set 
    8686# CONFIG_AR9VR9_AVM_CPUIDLE is not set 
    8787# CONFIG_ALCHEMY_GPIO_INDIRECT is not set 
     
    9090# CONFIG_ARCH_HAS_ILOG2_U64 is not set 
    9191# CONFIG_MIPS_FUSIV is not set 
    9292# CONFIG_MACH_ATHEROS is not set 
     93CONFIG_ARCH_SUPPORTS_OPROFILE=y 
    9394CONFIG_GENERIC_FIND_NEXT_BIT=y 
    9495CONFIG_GENERIC_HWEIGHT=y 
    9596CONFIG_GENERIC_CALIBRATE_DELAY=y 
     
    114115# CONFIG_MIPS_MACHINE is not set 
    115116# CONFIG_IMAGE_CMDLINE_HACK is not set 
    116117# CONFIG_NO_IOPORT is not set 
    117 CONFIG_CPU_HAS_DSP_ASE=y 
     118# CONFIG_CPU_HAS_DSP_ASE is not set 
    118119CONFIG_CPU_BIG_ENDIAN=y 
    119120# CONFIG_CPU_LITTLE_ENDIAN is not set 
    120121CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 
     
    174175CONFIG_THREAD_SIZE_ORDER=2 
    175176CONFIG_CPU_HAS_PREFETCH=y 
    176177# CONFIG_AVM_WP is not set 
    177 # CONFIG_MIPS_MT_DISABLED is not set 
     178CONFIG_MIPS_MT_DISABLED=y 
    178179# CONFIG_MIPS_MT_SMP is not set 
    179 CONFIG_MIPS_MT_SMTC=y 
     180# CONFIG_MIPS_MT_SMTC is not set 
    180181CONFIG_MIPS_MT=y 
    181182CONFIG_SYS_SUPPORTS_MULTITHREADING=y 
    182 CONFIG_MIPS_MT_FPAFF=y 
    183 # CONFIG_MIPS_VPE_LOADER is not set 
    184 CONFIG_PERFCTRS=y 
    185 CONFIG_MTSCHED=y 
    186 # CONFIG_MIPS_MT_SMTC_IM_BACKSTOP is not set 
    187 # CONFIG_MIPS_MT_SMTC_IRQAFF is not set 
     183CONFIG_MIPS_VPE_LOADER=y 
     184# CONFIG_IFX_VPE_EXT is not set 
     185# CONFIG_PERFCTRS is not set 
     186# CONFIG_MTSCHED is not set 
     187CONFIG_MIPS_VPE_LOADER_TOM=y 
     188# CONFIG_MIPS_VPE_APSP_API is not set 
    188189CONFIG_CPU_MIPSR2_IRQ_VI=y 
    189190CONFIG_CPU_MIPSR2_IRQ_EI=y 
    190191CONFIG_CPU_HAS_SYNC=y 
    191192CONFIG_GENERIC_HARDIRQS=y 
    192193CONFIG_GENERIC_IRQ_PROBE=y 
    193 CONFIG_IRQ_PER_CPU=y 
    194194CONFIG_ARCH_FLATMEM_ENABLE=y 
    195195CONFIG_ARCH_POPULATES_NODE_MAP=y 
    196196CONFIG_SELECT_MEMORY_MODEL=y 
     
    206206CONFIG_VIRT_TO_BUS=y 
    207207CONFIG_HAVE_MLOCK=y 
    208208CONFIG_HAVE_MLOCKED_PAGE_BIT=y 
    209 CONFIG_KSM=y 
     209# CONFIG_KSM is not set 
    210210CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 
    211 # CONFIG_AVM_LOW_MEMORY_STRATEGY is not set 
    212 CONFIG_SMP=y 
    213 CONFIG_SMP_UP=y 
    214 CONFIG_SYS_SUPPORTS_SMP=y 
    215 CONFIG_NR_CPUS_DEFAULT_8=y 
    216 CONFIG_NR_CPUS=2 
     211CONFIG_AVM_LOW_MEMORY_STRATEGY=y 
    217212CONFIG_TICK_ONESHOT=y 
    218213CONFIG_NO_HZ=y 
    219214CONFIG_HIGH_RES_TIMERS=y 
     
    226221# CONFIG_HZ_1000 is not set 
    227222# CONFIG_HZ_1024 is not set 
    228223CONFIG_SYS_SUPPORTS_100HZ=y 
    229 CONFIG_SYS_SUPPORTS_250HZ=y 
    230224CONFIG_SYS_SUPPORTS_1000HZ=y 
    231225CONFIG_HZ=100 
    232226CONFIG_PREEMPT_NONE=y 
     
    243237# General setup 
    244238# 
    245239CONFIG_EXPERIMENTAL=y 
    246 CONFIG_LOCK_KERNEL=y 
     240CONFIG_BROKEN_ON_SMP=y 
    247241CONFIG_INIT_ENV_ARG_LIMIT=32 
    248242CONFIG_LOCALVERSION="" 
    249243# CONFIG_LOCALVERSION_AUTO is not set 
     
    255249CONFIG_BSD_PROCESS_ACCT=y 
    256250CONFIG_BSD_PROCESS_ACCT_V3=y 
    257251# CONFIG_TASKSTATS is not set 
    258 # CONFIG_AUDIT is not set 
     252CONFIG_AUDIT=y 
    259253 
    260254# 
    261255# RCU Subsystem 
     
    274268# CONFIG_NAMESPACES is not set 
    275269CONFIG_BLK_DEV_INITRD=y 
    276270CONFIG_INITRAMFS_SOURCE="" 
    277 # CONFIG_RD_GZIP is not set 
     271CONFIG_RD_GZIP=y 
    278272# CONFIG_RD_BZIP2 is not set 
    279273# CONFIG_RD_LZMA is not set 
    280 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 
     274CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
    281275CONFIG_SYSCTL=y 
    282276CONFIG_ANON_INODES=y 
    283277CONFIG_EMBEDDED=y 
    284278CONFIG_SYSCTL_SYSCALL=y 
    285 CONFIG_KALLSYMS=y 
    286 CONFIG_KALLSYMS_ALL=y 
    287 CONFIG_KALLSYMS_EXTRA_PASS=y 
     279# CONFIG_KALLSYMS is not set 
    288280CONFIG_HOTPLUG=y 
    289281CONFIG_PRINTK=y 
    290 CONFIG_BUG=y 
     282# CONFIG_BUG is not set 
    291283CONFIG_ELF_CORE=y 
    292 # CONFIG_PCSPKR_PLATFORM is not set 
     284CONFIG_PCSPKR_PLATFORM=y 
    293285CONFIG_BASE_FULL=y 
    294286CONFIG_FUTEX=y 
    295287CONFIG_EPOLL=y 
     
    312304CONFIG_AVM_SIMPLE_PROFILING=y 
    313305# CONFIG_AVM_SIMPLE_PROFILING_YIELD is not set 
    314306CONFIG_HAVE_OPROFILE=y 
    315 CONFIG_USE_GENERIC_SMP_HELPERS=y 
    316 # CONFIG_AVM_ARCH_STATIC_WLAN_MEMORY is not set 
     307CONFIG_AVM_ARCH_STATIC_WLAN_MEMORY=y 
     308CONFIG_AVM_ARCH_STATIC_WLAN_MEMORY_SIZE=392 
    317309 
    318310# 
    319311# GCOV-based kernel profiling 
     
    330322# CONFIG_MODULE_FORCE_UNLOAD is not set 
    331323# CONFIG_MODVERSIONS is not set 
    332324# CONFIG_MODULE_SRCVERSION_ALL is not set 
    333 CONFIG_STOP_MACHINE=y 
    334325CONFIG_BLOCK=y 
    335326CONFIG_LBDAF=y 
    336327# CONFIG_BLK_DEV_BSG is not set 
     
    358349# CONFIG_ATH_HAS_PCI_RC2 is not set 
    359350CONFIG_PCI=y 
    360351CONFIG_PCI_DOMAINS=y 
    361 CONFIG_PCIEPORTBUS=y 
    362 CONFIG_PCIEAER=y 
    363 # CONFIG_PCIE_ECRC is not set 
    364 # CONFIG_PCIEAER_INJECT is not set 
    365 CONFIG_IFX_PCIE=y 
    366 CONFIG_IFX_PCIE_PHY_36MHZ_MODE=y 
    367 # CONFIG_IFX_PCIE_PHY_25MHZ_MODE is not set 
    368 # CONFIG_IFX_PCIE_PHY_100MHZ_MODE is not set 
    369 CONFIG_IFX_PCIE_1ST_CORE=y 
    370 CONFIG_IFX_PCIE_HW_SWAP=y 
    371 # CONFIG_IFX_PCIE_INBOUND_NO_HW_SWAP is not set 
    372 # CONFIG_IFX_PCIE_VR9_A11_HRST is not set 
    373 # CONFIG_PCIEASPM is not set 
    374 CONFIG_ARCH_SUPPORTS_MSI=y 
    375 # CONFIG_PCI_MSI is not set 
     352# CONFIG_PCIEPORTBUS is not set 
     353# CONFIG_ARCH_SUPPORTS_MSI is not set 
    376354CONFIG_PCI_LEGACY=y 
    377355# CONFIG_PCI_INIT_IN_MONITOR is not set 
    378356# CONFIG_PCI_DEBUG is not set 
    379357# CONFIG_PCI_STUB is not set 
    380358# CONFIG_PCI_DISABLE_COMMON_QUIRKS is not set 
    381359# CONFIG_PCI_IOV is not set 
    382 # CONFIG_IFX_PCI is not set 
     360CONFIG_IFX_PCI=y 
     361CONFIG_IFX_PCI_HW_SWAP=y 
     362CONFIG_IFX_PCI_INTERNAL_CLK_SRC_33=y 
     363# CONFIG_IFX_PCI_INTERNAL_CLK_SRC_60 is not set 
     364# CONFIG_IFX_PCI_EXTERNAL_CLK_SRC is not set 
     365CONFIG_IFX_PCI_CLOCK_DELAY_NANO_SECONDS=1 
     366CONFIG_IFX_PCI_CLOCK_DELAY_TENTH_NANO_SECOND=0 
     367# CONFIG_IFX_DUAL_MINI_PCI is not set 
    383368CONFIG_MMU=y 
    384369# CONFIG_PCCARD is not set 
    385370# CONFIG_HOTPLUG_PCI is not set 
     
    396381# 
    397382# Power management options 
    398383# 
     384CONFIG_ARCH_HIBERNATION_POSSIBLE=y 
     385# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 
    399386# CONFIG_PM is not set 
    400387# CONFIG_CPU_FREQ is not set 
    401388# CONFIG_CPU_IDLE is not set 
     
    532519CONFIG_BRIDGE=y 
    533520# CONFIG_BRIDGE_SNOOPING is not set 
    534521# CONFIG_NET_DSA is not set 
    535 CONFIG_VLAN_8021Q=y 
    536 # CONFIG_VLAN_8021Q_GVRP is not set 
     522# CONFIG_VLAN_8021Q is not set 
    537523# CONFIG_DECNET is not set 
    538524CONFIG_LLC=y 
    539525# CONFIG_LLC2 is not set 
     
    630616# CONFIG_DEVTMPFS is not set 
    631617CONFIG_STANDALONE=y 
    632618CONFIG_PREVENT_FIRMWARE_BUILD=y 
    633 CONFIG_FW_LOADER=y 
    634 # CONFIG_FIRMWARE_IN_KERNEL is not set 
    635 CONFIG_EXTRA_FIRMWARE="" 
     619# CONFIG_FW_LOADER is not set 
    636620# CONFIG_DEBUG_DRIVER is not set 
    637621# CONFIG_DEBUG_DEVRES is not set 
    638622# CONFIG_SYS_HYPERVISOR is not set 
     
    724708# CONFIG_MTD_ATH_FLASH is not set 
    725709# CONFIG_MTD_AR7100_SPI_FLASH is not set 
    726710# CONFIG_MTD_AR9100_PARALLEL_FLASH is not set 
    727 CONFIG_MTD_NAND=y 
    728 CONFIG_MTD_NAND_VERIFY_WRITE=y 
    729 # CONFIG_MTD_NAND_ECC_SMC is not set 
    730 # CONFIG_MTD_NAND_MUSEUM_IDS is not set 
    731 CONFIG_MTD_NAND_IDS=y 
    732 # CONFIG_MTD_NAND_DISKONCHIP is not set 
    733 # CONFIG_MTD_NAND_CAFE is not set 
    734 # CONFIG_MTD_NAND_NANDSIM is not set 
    735 # CONFIG_MTD_NAND_PLATFORM is not set 
    736 # CONFIG_MTD_ALAUDA is not set 
    737 # CONFIG_MTD_NAND_COMPLETE_AVM is not set 
    738 CONFIG_MTD_IFX_NAND_LATCH_ENABLE=y 
    739 CONFIG_MTD_IFX_NAND=y 
    740 CONFIG_MTD_IFX_NAND_FLASH_SIZE=128 
    741 # CONFIG_MTD_IFX_HSNAND is not set 
     711# CONFIG_MTD_NAND is not set 
    742712# CONFIG_MTD_ONENAND is not set 
    743713 
    744714# 
     
    841811CONFIG_AVM_CPMAC=y 
    842812CONFIG_AVM_CPMAC_NUM_RX_BUFFERS=256 
    843813CONFIG_AVM_CPMAC_SWITCH=y 
    844 CONFIG_AVM_SCATTER_GATHER=y 
     814# CONFIG_AVM_SCATTER_GATHER is not set 
    845815# CONFIG_AVMNET_DEBUG is not set 
    846816# CONFIG_AVMNET_DEBUG_HAL is not set 
    847817# CONFIG_AX88796 is not set 
     
    901871# CONFIG_AR7240_S26_PHY is not set 
    902872# CONFIG_ATHRS27_PHY is not set 
    903873CONFIG_LANTIQ_11G_PHY=y 
    904 CONFIG_WLAN_OFFLOAD_PHY=y 
     874# CONFIG_WLAN_OFFLOAD_PHY is not set 
    905875# CONFIG_NETDEV_10000 is not set 
    906876# CONFIG_TR is not set 
    907 # CONFIG_WLAN is not set 
     877CONFIG_WLAN=y 
     878# CONFIG_WLAN_PRE80211 is not set 
     879# CONFIG_WLAN_80211 is not set 
    908880 
    909881# 
    910882# Enable WiMAX (Networking options) to see the WiMAX drivers 
     
    949921# CONFIG_ATM_SOLOS is not set 
    950922# CONFIG_IFX_ATM is not set 
    951923# CONFIG_IFX_PTM is not set 
    952 # CONFIG_IFX_ADTRAN_PTM is not set 
    953924CONFIG_IFX_ETHSW_API=y 
     925# CONFIG_BOTH_INTERFACE is not set 
     926CONFIG_INTERNAL_AR9=y 
     927# CONFIG_EXTERNAL_T3G is not set 
    954928 
    955929# 
    956930# IFX_ETHSW_API 
     
    963937# CONFIG_LTQ_WOL is not set 
    964938# CONFIG_IFX_ETHSW_API_COC is not set 
    965939# CONFIG_IFX_ETHSW_API_COC_PMCU is not set 
    966 # CONFIG_GPHY_DRIVER is not set 
    967940CONFIG_IFX_PPA_NAPI_ENABLE=y 
    968941CONFIG_IFX_PPA=y 
    969942CONFIG_IFX_PPA_AVM_USAGE=y 
    970 CONFIG_IFX_PPA_API=n 
     943CONFIG_IFX_PPA_API=m 
    971944# CONFIG_IFX_PPA_API_DIRECTPATH is not set 
    972945# CONFIG_DEBUG_AVM_PPA_VDEV is not set 
    973 CONFIG_IFX_PPA_API_PROC=n 
     946CONFIG_IFX_PPA_API_PROC=m 
    974947CONFIG_IFX_PPA_MFE=y 
    975 CONFIG_IFX_PPA_QOS=y 
    976 CONFIG_IFX_PPA_QOS_WFQ=y 
    977 CONFIG_IFX_PPA_QOS_RATE_SHAPING=y 
    978 CONFIG_IFX_PPA_DATAPATH=n 
    979 # CONFIG_IFX_PPA_A5 is not set 
     948# CONFIG_IFX_PPA_QOS is not set 
     949CONFIG_IFX_PPA_DATAPATH=m 
     950CONFIG_IFX_PPA_A5=y 
    980951# CONFIG_IFX_PPA_D5 is not set 
    981 CONFIG_IFX_PPA_E5=y 
    982 # CONFIG_IFX_PPE_E5_OFFCHIP_BONDING is not set 
     952# CONFIG_IFX_PPA_E5 is not set 
    983953CONFIG_IFX_PPA_IPv6_ENABLE=y 
    984 CONFIG_PTM_VECTORING=y 
    985 # CONFIG_IFX_7PORT_SWITCH is not set 
     954# CONFIG_PTM_VECTORING is not set 
     955# CONFIG_IFX_3PORT_SWITCH is not set 
     956# CONFIG_MII1_AUTONEG is not set 
     957# CONFIG_MII1_RGMII_MODE_100MB is not set 
     958# CONFIG_MII1_RGMII_MODE is not set 
     959CONFIG_MII_SETUP_AVMNET=y 
    986960CONFIG_IFX_ETH_FRAMEWORK=y 
    987961# CONFIG_FDDI is not set 
    988962# CONFIG_HIPPI is not set 
     
    11061080CONFIG_SERIAL_AVM_ASC=y 
    11071081CONFIG_SERIAL_AVM_ASC_CONSOLE=y 
    11081082# CONFIG_SERIAL_IFX_ASC is not set 
    1109 # CONFIG_SERIAL_IFX_USIF_UART is not set 
    11101083CONFIG_UNIX98_PTYS=y 
    11111084# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 
    11121085CONFIG_LEGACY_PTYS=y 
     
    11521125CONFIG_AVM_PIGLET_DECT=y 
    11531126CONFIG_UBIK2=n 
    11541127CONFIG_UBIK2_DEVELOPMENT_SUPPORT=0 
    1155 CONFIG_UBIK2_MSEC_PER_IRQ=4 
     1128CONFIG_UBIK2_MSEC_PER_IRQ=8 
    11561129CONFIG_IFX_PMCU=y 
    1157 # CONFIG_IFX_CPUFREQ is not set 
     1130CONFIG_IFX_CPUFREQ=y 
    11581131CONFIG_IFX_PMU=y 
    1159 CONFIG_IFX_PMU_POWER_GATING=y 
    11601132CONFIG_IFX_GPIO=y 
    11611133CONFIG_IFX_RCU=y 
    11621134# CONFIG_IFX_SI is not set 
    11631135# CONFIG_IFX_LEDC is not set 
    11641136CONFIG_IFX_WDT=y 
     1137CONFIG_IFXMIPS_DSL_CPE_MEI=y 
    11651138CONFIG_DSL_MEI_CPE_DRV=y 
    1166 # CONFIG_IFX_PMON is not set 
    1167 # CONFIG_IFX_DCDC is not set 
    1168 CONFIG_IFX_TS=y 
    11691139CONFIG_I2C=y 
    11701140CONFIG_I2C_BOARDINFO=y 
    11711141CONFIG_I2C_COMPAT=y 
     
    12441214CONFIG_SPI_BITBANG=y 
    12451215CONFIG_IFX_SPI=y 
    12461216# CONFIG_IFX_SPI_DEBUG is not set 
    1247 # CONFIG_IFX_SPI_ASYNCHRONOUS is not set 
     1217CONFIG_IFX_SPI_ASYNCHRONOUS=y 
    12481218CONFIG_IFX_SPI_FLASH=y 
    12491219# CONFIG_IFX_SPI_AT45_FLASH is not set 
    1250 # CONFIG_IFX_USIF_SPI is not set 
    12511220 
    12521221# 
    12531222# SPI Protocol Masters 
     
    13381307# CONFIG_USB_OTG is not set 
    13391308# CONFIG_USB_OTG_WHITELIST is not set 
    13401309# CONFIG_USB_OTG_BLACKLIST_HUB is not set 
    1341 # CONFIG_USB_MON is not set 
     1310CONFIG_USB_MON=n 
    13421311# CONFIG_USB_WUSB is not set 
    13431312# CONFIG_USB_WUSB_CBAF is not set 
    13441313 
     
    13461315# USB Host Controller Drivers 
    13471316# 
    13481317# CONFIG_USB_C67X00_HCD is not set 
    1349 CONFIG_USB_XHCI_HCD=n 
    1350 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set 
     1318# CONFIG_USB_XHCI_HCD is not set 
    13511319# CONFIG_USB_EHCI_HCD is not set 
    13521320# CONFIG_USB_OXU210HP_HCD is not set 
    13531321# CONFIG_USB_ISP116X_HCD is not set 
     
    13731341# 
    13741342# USB Device Class drivers 
    13751343# 
    1376 CONFIG_USB_ACM=n 
     1344# CONFIG_USB_ACM is not set 
    13771345CONFIG_USB_PRINTER=n 
    13781346# CONFIG_USB_WDM is not set 
    13791347# CONFIG_USB_TMC is not set 
     
    14181386# CONFIG_USB_SERIAL_CH341 is not set 
    14191387# CONFIG_USB_SERIAL_WHITEHEAT is not set 
    14201388# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set 
    1421 CONFIG_USB_SERIAL_CP210X=n 
     1389# CONFIG_USB_SERIAL_CP210X is not set 
    14221390# CONFIG_USB_SERIAL_CYPRESS_M8 is not set 
    14231391# CONFIG_USB_SERIAL_EMPEG is not set 
    14241392CONFIG_USB_SERIAL_FTDI_SIO=n 
     
    16091577# CONFIG_OCFS2_FS is not set 
    16101578# CONFIG_BTRFS_FS is not set 
    16111579# CONFIG_NILFS2_FS is not set 
    1612 CONFIG_YAFFS_FS=y 
    1613 CONFIG_YAFFS_YAFFS1=y 
    1614 # CONFIG_YAFFS_9BYTE_TAGS is not set 
    1615 # CONFIG_YAFFS_DOES_ECC is not set 
    1616 CONFIG_YAFFS_YAFFS2=y 
    1617 CONFIG_YAFFS_AUTO_YAFFS2=y 
    1618 CONFIG_YAFFS_DISABLE_TAGS_ECC=y 
    1619 # CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set 
    1620 CONFIG_YAFFS_EMPTY_LOST_AND_FOUND=y 
    1621 # CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING is not set 
    1622 # CONFIG_YAFFS_DISABLE_BACKGROUND is not set 
    1623 CONFIG_YAFFS_XATTR=y 
     1580# CONFIG_YAFFS_FS is not set 
    16241581CONFIG_FILE_LOCKING=y 
    16251582CONFIG_FSNOTIFY=y 
    16261583# CONFIG_DNOTIFY is not set 
     
    16741631# CONFIG_BEFS_FS is not set 
    16751632# CONFIG_BFS_FS is not set 
    16761633# CONFIG_EFS_FS is not set 
    1677 CONFIG_JFFS2_FS=n 
     1634CONFIG_JFFS2_FS=y 
    16781635CONFIG_JFFS2_FS_DEBUG=0 
    16791636CONFIG_JFFS2_FS_WRITEBUFFER=y 
    16801637# CONFIG_JFFS2_FS_WBUF_VERIFY is not set 
     
    17781735CONFIG_ENABLE_MUST_CHECK=y 
    17791736CONFIG_FRAME_WARN=1024 
    17801737CONFIG_MAGIC_SYSRQ=y 
    1781 # CONFIG_STRIP_ASM_SYMS is not set 
     1738CONFIG_STRIP_ASM_SYMS=y 
    17821739CONFIG_UNUSED_SYMBOLS=y 
    17831740# CONFIG_DEBUG_FS is not set 
    17841741# CONFIG_HEADERS_CHECK is not set 
    17851742CONFIG_DEBUG_KERNEL=y 
    17861743# CONFIG_DEBUG_SHIRQ is not set 
    1787 CONFIG_DETECT_SOFTLOCKUP=y 
    1788 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y 
    1789 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1 
     1744# CONFIG_DETECT_SOFTLOCKUP is not set 
    17901745# CONFIG_DETECT_HUNG_TASK is not set 
    17911746# CONFIG_SCHED_DEBUG is not set 
    17921747# CONFIG_SCHEDSTATS is not set 
     
    17951750# CONFIG_DEBUG_SLAB is not set 
    17961751# CONFIG_DEBUG_RT_MUTEXES is not set 
    17971752# CONFIG_RT_MUTEX_TESTER is not set 
    1798 CONFIG_DEBUG_SPINLOCK=y 
     1753# CONFIG_DEBUG_SPINLOCK is not set 
    17991754# CONFIG_DEBUG_MUTEXES is not set 
    18001755# CONFIG_DEBUG_LOCK_ALLOC is not set 
    18011756# CONFIG_PROVE_LOCKING is not set 
     
    18321787# CONFIG_KGDB is not set 
    18331788CONFIG_CMDLINE="" 
    18341789# CONFIG_DEBUG_STACK_USAGE is not set 
    1835 # CONFIG_SMTC_IDLE_HOOK_DEBUG is not set 
    18361790# CONFIG_RUNTIME_DEBUG is not set 
    1837 CONFIG_BDI_SWITCH=y 
     1791# CONFIG_BDI_SWITCH is not set 
    18381792 
    18391793# 
    18401794# Security options 
     
    18461800CONFIG_SECURITY_NETWORK=y 
    18471801# CONFIG_SECURITY_PATH is not set 
    18481802# CONFIG_SECURITY_FILE_CAPABILITIES is not set 
     1803# CONFIG_SECURITY_SELINUX is not set 
    18491804# CONFIG_SECURITY_TOMOYO is not set 
    18501805CONFIG_CRYPTO=y 
    18511806 
     
    19621917CONFIG_CRC32=y 
    19631918# CONFIG_CRC7 is not set 
    19641919CONFIG_LIBCRC32C=n 
     1920CONFIG_AUDIT_GENERIC=y 
    19651921CONFIG_ZLIB_INFLATE=y 
    19661922CONFIG_ZLIB_DEFLATE=y 
    19671923CONFIG_LZO_COMPRESS=n 
    19681924CONFIG_LZO_DECOMPRESS=n 
     1925CONFIG_DECOMPRESS_GZIP=y 
    19691926# CONFIG_TEXTSEARCH is not set 
    19701927# CONFIG_TEXTSEARCH_KMP is not set 
    19711928# CONFIG_TEXTSEARCH_BM is not set 
  • .6.32/arch/mips/atheros/934x.c

    diff -burN 7362_linux-2.6.32/arch/mips/atheros/934x.c 7320_linux-2.6.32/arch/mips/atheros/934x.c
    old new  
    388388        case 190: 
    389389        case 201: 
    390390        case 194: 
     391        case 207: 
    391392            /*--- printk(KERN_ERR "{%s} HWRevision %d\n", __func__, HWRevision); ---*/ 
    392393            ath_reg_wr(0x18116c40, 0x633c8166); 
    393394            ath_reg_wr(0x18116c44, 0x10000000);     /*--- AR_PHY_PMU2 ---*/ 
    394             ath_reg_wr(0x18116cc0, 0x1061060e);     /*--- change PCIE to reduce power about 18mA ---*/ 
    395             ath_reg_wr(0x18116d00, 0x1061060e);     /*--- change PCIE to reduce power about 18mA ---*/ 
     395 
    396396            break; 
    397397        default: 
    398398            break; 
    399399    } 
    400400 
     401#if !defined(CONFIG_PCI) 
     402    printk("[%s] disable PCIe\n", __func__); 
     403    ath_reg_wr(ATH_PCIE_PHY_REG1,    0x1061060e);     /*--- change PCIE to reduce power about 18mA ---*/ 
     404    ath_reg_wr(ATH_PCIE_EP_PHY_REG1, 0x1061060e);     /*--- change PCIE to reduce power about 18mA ---*/ 
     405 
     406    ath_reg_wr_nf(ATH_PLL_BASE + PCIE_PLL_CONFIG_OFFSET, 
     407        PCIE_PLL_CONFIG_REFDIV_SET(1) | 
     408        PCIE_PLL_CONFIG_BYPASS_SET(1) | 
     409        PCIE_PLL_CONFIG_PLLPWD_SET(1)); 
     410#endif 
     411 
    401412    return 0; 
    402413} 
    403414 
  • .6.32/arch/mips/atheros/Makefile

    diff -burN 7362_linux-2.6.32/arch/mips/atheros/Makefile 7320_linux-2.6.32/arch/mips/atheros/Makefile
    old new  
    2323        irq.o   \ 
    2424        setup.o \ 
    2525        misc.o \ 
     26        sram_panic.o \ 
    2627        platform.o \ 
    2728        mtd.o \ 
    2829        avm_hw_config.o 
  • .6.32/arch/mips/atheros/setup.c

    diff -burN 7362_linux-2.6.32/arch/mips/atheros/setup.c 7320_linux-2.6.32/arch/mips/atheros/setup.c
    old new  
    4949 * Export Ref freq value to be used by I2S module. 
    5050 */ 
    5151EXPORT_SYMBOL(ath_ref_freq); 
    52  
    53  
    54 static char *reboot_status[] = { 
    55 #define RS_FIRMWARE_UPDATE         0 
    56     "Firmware-Update", 
    57 #define RS_SOFT_REBOOT             1 
    58     "Software-Reboot", 
    59 #define RS_SOFT_WATCHDOG           2 
    60     "Software-NMI-Watchdog", 
    61 #define RS_NMI_WA                  3 
    62     "Software-NMI-Workaround", 
    63 #define RS_BUS_ERROR               4 
    64     "Bus Error", 
    65 #define RS_NMI_PON                 5 
    66     "Power-On-Reboot"   /*--- last entry ---*/ 
    67 }; 
    68  
    69 #if defined(CONFIG_MACH_AR934x) 
    70 /*--- nutze internen SRAM ---*/ 
    71 #define ATH_SRAM_PRINTKLEN      ((ATH_SRAM_SIZE / 2) + (ATH_SRAM_SIZE / 4)) 
    72 #define ATH_REBOOT_LOGBUFFER    (ATH_SRAM_BASE_UNCACHED + ATH_SRAM_SIZE - ATH_SRAM_PRINTKLEN)    
    73 #else/*--- #if defined(CONFIG_MACH_AR934x) ---*/ 
    74 #undef ATH_SRAM_PRINTKLEN  
    75 #define ATH_REBOOT_LOGBUFFER    (0xA1000000 - 512) 
    76 #endif/*--- #else ---*//*--- #if defined(CONFIG_MACH_AR934x) ---*/ 
    77  
    78 #define MAGIC_PRINK_WORD          0x5352414D 
    79 #define MAGIC_REBOOT_STATUS_WORD  0x53544130 
    80  
    81 #define MAGIC_REBOOT_STATUS_WORD_SET(a)   (((a) & 0xF) | MAGIC_REBOOT_STATUS_WORD) 
    82 #define MAGIC_REBOOT_STATUS_WORD_CHECK(a) (((a) & ~0xF)  == MAGIC_REBOOT_STATUS_WORD) 
    83  
    84 struct _ram_print_data { 
    85     volatile unsigned int rebootstatus; 
    86     volatile unsigned int magic_word; 
    87     volatile unsigned int len; 
    88     unsigned char data[1]; 
    89 }; 
    9052/*--------------------------------------------------------------------------------*\ 
    91  * im internen SRAM ablegen 
    9253\*--------------------------------------------------------------------------------*/ 
    93 static void ath_savelog_to_ram(void) { 
    94 #if defined(CONFIG_TFFS_PANIC_LOG) && defined(ATH_SRAM_PRINTKLEN) 
    95     extern unsigned long printk_get_buffer(char **p_log_buf, unsigned long *p_log_end, unsigned long *p_anzahl); 
    96     struct _ram_print_data *psram_print = (struct _ram_print_data *)ATH_REBOOT_LOGBUFFER; 
    97     char *buf; 
    98     unsigned long end, len; 
    99     unsigned long log_bufsize, limit; 
    100      
    101     restore_printk(); 
    102     log_bufsize = printk_get_buffer(&buf, &end, &len); 
    103     psram_print->len        = 0; 
    104     psram_print->magic_word = MAGIC_PRINK_WORD; 
    105     limit =  ATH_SRAM_PRINTKLEN - sizeof(struct _ram_print_data); 
    106      
    107     /*--- printk("%s %d: len=%lu end=%lu log_bufsize =%lu limit=%lu\n",__func__, __LINE__, len, end, log_bufsize, limit); ---*/ 
    108     if(log_bufsize >= len) { 
    109         /*--- alles im Buffer ---*/ 
    110         unsigned int start; 
    111         if(limit > len) { 
    112             start = 0; 
    113             limit = len; 
    114         } else { 
    115             start = len - limit; 
    116         } 
    117         memcpy(psram_print->data, buf + start, limit); 
    118     } else { 
    119         if(limit > end) { 
    120             unsigned int start_rest   = limit - end; 
    121             unsigned int start_offset = log_bufsize - start_rest; 
    122             memcpy(psram_print->data, buf + start_offset, start_rest); 
    123             memcpy(psram_print->data + start_rest, buf, limit - start_rest); 
    124         } else { 
    125             unsigned int start = end - limit; 
    126             memcpy(psram_print->data, buf + start, limit); 
    127         } 
    128     } 
    129     psram_print->len        = limit; 
    130     psram_print->magic_word = MAGIC_PRINK_WORD; 
    131 #endif /*--- #ifdef CONFIG_TFFS_PANIC_LOG ---*/ 
    132 } 
    133 /*--------------------------------------------------------------------------------*\ 
    134 \*--------------------------------------------------------------------------------*/ 
    135 static void ath_restore_log_from_ram(void) { 
    136 #if defined(CONFIG_TFFS_PANIC_LOG) && defined(ATH_SRAM_PRINTKLEN) 
    137     struct _ram_print_data *psram_print = (struct _ram_print_data *)ATH_REBOOT_LOGBUFFER; 
    138     char buf[128]; 
    139  
    140     if((psram_print->len < ATH_SRAM_PRINTKLEN) && (psram_print->magic_word == MAGIC_PRINK_WORD)) { 
    141         char *p          = psram_print->data; 
    142         unsigned int idx = 0; 
    143         unsigned int len = psram_print->len; 
    144         psram_print->magic_word = 0; 
    145         psram_print->len        = 0; 
    146         printk("--------------- LOG found in SRAM (len = %u) ------------------------\n", len); 
    147         while(len) { 
    148             if(idx < (sizeof(buf) - 2)) {   
    149                 if((*p != '\r') && (*p != '\n')) { 
    150                     if((*p >= 0x80) || (*p < 0x20) && (*p != '\t')) { 
    151                         buf[idx] = '?'; 
    152                     } else { 
    153                         buf[idx] = *p; 
    154                     } 
    155                     p++, idx++, len--; 
    156                     continue; 
    157                 } 
    158                 p++, len--; 
    159             } 
    160             if(idx) { 
    161                 buf[idx] = 0; 
    162                 printk("LOG:%s\n", buf); 
    163                 idx = 0; 
    164             } 
    165         } 
    166         if(idx) printk("LOG: %s\n", buf); 
    167         printk("---------------------------------------------------------------------\n"); 
    168     } 
    169 #endif/*--- #if defined(CONFIG_TFFS_PANIC_LOG) && defined(ATH_SRAM_PRINTKLEN) ---*/ 
    170 } 
    171 /*--------------------------------------------------------------------------------*\ 
    172 \*--------------------------------------------------------------------------------*/ 
    173 static void ath_save_rebootstatus_to_ram(unsigned int idx) { 
    174     struct _ram_print_data *pram_print = (struct _ram_print_data *)ATH_REBOOT_LOGBUFFER; 
    175      
    176     if(!MAGIC_REBOOT_STATUS_WORD_CHECK(pram_print->rebootstatus)) { 
    177         pram_print->rebootstatus = MAGIC_REBOOT_STATUS_WORD_SET(idx); 
    178     } 
    179 } 
    180 /*--------------------------------------------------------------------------------*\ 
    181 \*--------------------------------------------------------------------------------*/ 
    182 static void ath_reboot_status_from_ram(void) { 
    183     struct _ram_print_data *pram_print = (struct _ram_print_data *)ATH_REBOOT_LOGBUFFER; 
    184     unsigned int status = RS_NMI_PON; 
    185  
    186     if(MAGIC_REBOOT_STATUS_WORD_CHECK(pram_print->rebootstatus)) { 
    187         status =  pram_print->rebootstatus & 0xF; 
    188         pram_print->rebootstatus = 0x0; 
    189     } 
    190     if((status >= sizeof(reboot_status) / sizeof(reboot_status[0]))) { 
    191         status = sizeof(reboot_status) / sizeof(reboot_status[0]) - 1; 
    192     } 
    193     printk(KERN_ERR"(c) AVM 2013, Reboot Status is: %s\n", reboot_status[status]); 
    194     ath_restore_log_from_ram(); 
    195 } 
    196 arch_initcall(ath_reboot_status_from_ram); 
    197 /*------------------------------------------------------------------------------------------*\ 
    198 \*------------------------------------------------------------------------------------------*/ 
    199 void set_reboot_status_to_NMI(void) { 
    200     ath_save_rebootstatus_to_ram(RS_SOFT_WATCHDOG); 
    201 } 
     54extern void ath_savelog_to_ram(void); 
     55extern void set_reboot_status_to_NMI(void); 
     56extern void set_reboot_status_to_NMI_WA(void); 
     57extern void set_reboot_status_to_BusError(void); 
     58extern void set_reboot_status_to_SoftReboot(void); 
    20259 
    20360/*------------------------------------------------------------------------------------------*\ 
    20461\*------------------------------------------------------------------------------------------*/ 
    205 void set_reboot_status_to_Update(void) { 
    206     ath_save_rebootstatus_to_ram(RS_FIRMWARE_UPDATE); 
    207 } 
    208  
    209 /*------------------------------------------------------------------------------------------*\ 
    210 \*------------------------------------------------------------------------------------------*/ 
    211 void ath_restart(char *command) 
    212 { 
     62void ath_restart(char *command) { 
    21363    unsigned int val = (1<<0); 
    21464 
    21565    if (command) { 
    21666        if ( ! strncmp(command, "watchdog", sizeof("watchdog") - 1)) { 
    21767            val = (1<<1); 
    218             ath_save_rebootstatus_to_ram(RS_SOFT_WATCHDOG); 
     68            set_reboot_status_to_NMI(); 
    21969            ath_savelog_to_ram(); 
    22070        } else if ( ! strncmp(command, "nmi_workaround", sizeof("nmi_workaround") - 1)) { 
    22171            val = (1<<2); 
    222             ath_save_rebootstatus_to_ram(RS_NMI_WA); 
     72            set_reboot_status_to_NMI_WA(); 
    22373            ath_savelog_to_ram(); 
    22474        } else if ( ! strncmp(command, "bus_error", sizeof("bus_error") - 1)) { 
    225             ath_save_rebootstatus_to_ram(RS_BUS_ERROR); 
     75            set_reboot_status_to_BusError(); 
    22676            ath_savelog_to_ram(); 
    22777        } 
    22878    } else { 
    229         ath_save_rebootstatus_to_ram(RS_SOFT_REBOOT); 
     79        set_reboot_status_to_SoftReboot(); 
    23080        if(oops_in_progress) { 
    23181            /*--- wir kommen aus panic() ---*/ 
    23282            ath_savelog_to_ram(); 
  • .6.32/arch/mips/atheros/sram_panic.c

    diff -burN 7362_linux-2.6.32/arch/mips/atheros/sram_panic.c 7320_linux-2.6.32/arch/mips/atheros/sram_panic.c
    old new  
     1/*--------------------------------------------------------------------------------*\ 
     2 * 
     3 *   Copyright (C) 2013 AVM GmbH <fritzbox_info@avm.de> 
     4 * 
     5 *   This program is free software; you can redistribute it and/or modify 
     6 *   it under the terms of the GNU General Public License as published by 
     7 *   the Free Software Foundation; either version 2 of the License, or 
     8 *   (at your option) any later version. 
     9 * 
     10 *   This program is distributed in the hope that it will be useful, 
     11 *   but WITHOUT ANY WARRANTY; without even the implied warranty of 
     12 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     13 *   GNU General Public License for more details. 
     14 * 
     15 *   You should have received a copy of the GNU General Public License 
     16 *   along with this program; if not, write to the Free Software 
     17 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
     18 * 
     19 * 
     20 * 
     21 * 
     22 *    Log printk-buffer and Reboot-Status to internal SRAM (wasp) 
     23 *    all other atheros-chipsets we use as small DRAM-Area to save Reboot-Status 
     24 * 
     25 * Author: mbahr@avm.de 
     26\*--------------------------------------------------------------------------------*/ 
     27#include <linux/version.h> 
     28#include <linux/init.h> 
     29#include <linux/delay.h> 
     30#include <linux/interrupt.h> 
     31#include <linux/fs.h> 
     32#include <linux/types.h> 
     33#include <linux/string.h> 
     34#include <linux/pci.h> 
     35#include <linux/mtd/mtd.h> 
     36 
     37#include <atheros.h> 
     38#include <asm/bootinfo.h> 
     39#include <asm/bugs.h> 
     40#include <asm/prom.h> 
     41#include <asm/reboot.h> 
     42 
     43/*--------------------------------------------------------------------------------*\ 
     44\*--------------------------------------------------------------------------------*/ 
     45static char *reboot_status[] = { 
     46#define RS_FIRMWARE_UPDATE         0 
     47    "Firmware-Update", 
     48#define RS_SOFT_REBOOT             1 
     49    "Software-Reboot", 
     50#define RS_SOFT_WATCHDOG           2 
     51    "Software-NMI-Watchdog", 
     52#define RS_NMI_WA                  3 
     53    "Software-NMI-Workaround", 
     54#define RS_BUS_ERROR               4 
     55    "Bus Error", 
     56#define RS_NMI_PON                 5 
     57    "Power-On-Reboot"   /*--- last entry ---*/ 
     58}; 
     59 
     60#if defined(CONFIG_MACH_AR934x) 
     61/*--- use internal sram, but not at the begin, because here maybe data from mni-workarround (aprox first 0x500 bytes) ---*/ 
     62#define ATH_SRAM_PRINTKLEN      ((ATH_SRAM_SIZE / 2) + (ATH_SRAM_SIZE / 4)) 
     63#define ATH_REBOOT_LOGBUFFER    (ATH_SRAM_BASE_UNCACHED + ATH_SRAM_SIZE - ATH_SRAM_PRINTKLEN)    
     64#else/*--- #if defined(CONFIG_MACH_AR934x) ---*/ 
     65#undef ATH_SRAM_PRINTKLEN  
     66#define ATH_REBOOT_LOGBUFFER    (0xA1000000 - 512) 
     67#endif/*--- #else ---*//*--- #if defined(CONFIG_MACH_AR934x) ---*/ 
     68 
     69#define MAGIC_PRINK_WORD          0x5352414D 
     70#define MAGIC_REBOOT_STATUS_WORD  0x53544130 
     71 
     72#define MAGIC_REBOOT_STATUS_WORD_SET(a)   (((a) & 0xF) | MAGIC_REBOOT_STATUS_WORD) 
     73#define MAGIC_REBOOT_STATUS_WORD_CHECK(a) (((a) & ~0xF)  == MAGIC_REBOOT_STATUS_WORD) 
     74 
     75/*--------------------------------------------------------------------------------*\ 
     76\*--------------------------------------------------------------------------------*/ 
     77struct _ram_print_data { 
     78    volatile unsigned int rebootstatus; 
     79    volatile unsigned int magic_word; 
     80    volatile unsigned int len; 
     81    unsigned char data[1]; 
     82}; 
     83/*--------------------------------------------------------------------------------*\ 
     84 * save log to internal SRAM 
     85\*--------------------------------------------------------------------------------*/ 
     86void ath_savelog_to_ram(void) { 
     87#if defined(CONFIG_TFFS_PANIC_LOG) && defined(ATH_SRAM_PRINTKLEN) 
     88    char time_stamp_buf[sizeof("UPTIME: \n") + 10 + sizeof("SRAM LOG VERSION 1.0\n")]; 
     89    unsigned long time_stamp_buf_len; 
     90    struct timespec uptime; 
     91    extern unsigned long printk_get_buffer(char **p_log_buf, unsigned long *p_log_end, unsigned long *p_anzahl); 
     92    struct _ram_print_data *psram_print = (struct _ram_print_data *)ATH_REBOOT_LOGBUFFER; 
     93    char *buf, *pdata; 
     94    unsigned long end, len; 
     95    unsigned long log_bufsize, limit; 
     96     
     97    do_posix_clock_monotonic_gettime(&uptime); 
     98    monotonic_to_bootbased(&uptime); 
     99    time_stamp_buf_len = snprintf(time_stamp_buf, sizeof(time_stamp_buf), "UPTIME: %lu\nSRAM LOG VERSION 1.0\n", (unsigned long) uptime.tv_sec); 
     100 
     101    restore_printk(); 
     102    log_bufsize = printk_get_buffer(&buf, &end, &len); 
     103    psram_print->len        = 0; 
     104    psram_print->magic_word = MAGIC_PRINK_WORD; 
     105    limit =  ATH_SRAM_PRINTKLEN - sizeof(struct _ram_print_data); 
     106    pdata = psram_print->data; 
     107    memcpy(pdata, time_stamp_buf, time_stamp_buf_len); 
     108    pdata += time_stamp_buf_len, limit -= time_stamp_buf_len; 
     109    /*--- printk(KERN_INFO"%s %d: len=%lu end=%lu log_bufsize =%lu limit=%lu\n",__func__, __LINE__, len, end, log_bufsize, limit); ---*/ 
     110    if(log_bufsize >= len) { 
     111        /*--- alles im Buffer ---*/ 
     112        unsigned int start; 
     113        if(limit > len) { 
     114            start = 0; 
     115            limit = len; 
     116        } else { 
     117            start = len - limit; 
     118        } 
     119        memcpy(pdata, buf + start, limit); 
     120    } else { 
     121        if(limit > end) { 
     122            unsigned int start_rest   = limit - end; 
     123            unsigned int start_offset = log_bufsize - start_rest; 
     124            memcpy(pdata, buf + start_offset, start_rest); 
     125            memcpy(pdata + start_rest, buf, limit - start_rest); 
     126        } else { 
     127            unsigned int start = end - limit; 
     128            memcpy(pdata, buf + start, limit); 
     129        } 
     130    } 
     131    psram_print->len        = limit; 
     132    psram_print->magic_word = MAGIC_PRINK_WORD; 
     133#endif /*--- #ifdef CONFIG_TFFS_PANIC_LOG ---*/ 
     134} 
     135#define rprint(buf, buf_len, args...) if(buf) { \ 
     136                                         if(buf_len > 0) { \ 
     137                                             unsigned int slen = snprintf(buf, buf_len, args); \ 
     138                                             buf += slen, buf_len -= slen; \ 
     139                                         } \ 
     140                                      } else { \ 
     141                                         printk(KERN_ERR args);\ 
     142                                      } 
     143/*--------------------------------------------------------------------------------*\ 
     144 * Restore Log from internal SRAM (if exist) 
     145 * txtbuf, txtlen: destination (if NULL use printk) 
     146 * ret: Laenge 
     147\*--------------------------------------------------------------------------------*/ 
     148int ath_restore_log_from_ram(char *txtbuf, unsigned int txtlen) { 
     149    char *txtstart = txtbuf; 
     150#if defined(CONFIG_TFFS_PANIC_LOG) && defined(ATH_SRAM_PRINTKLEN) 
     151    struct _ram_print_data *psram_print = (struct _ram_print_data *)ATH_REBOOT_LOGBUFFER; 
     152    char buf[128]; 
     153    /*--- printk(KERN_INFO"%s: %p len=%d/%d %x\n", __func__, txtbuf, txtlen,psram_print->len, psram_print->magic_word); ---*/ 
     154    if((psram_print->len < ATH_SRAM_PRINTKLEN) && (psram_print->magic_word == MAGIC_PRINK_WORD)) { 
     155        char *p          = psram_print->data; 
     156        unsigned int idx = 0; 
     157        unsigned int len = psram_print->len; 
     158        /*--- rprint(txtbuf, txtlen, "--------------- LOG found in SRAM (len = %u) ------------------------\n", len); ---*/ 
     159        while(len) { 
     160            if(idx < (sizeof(buf) - 2)) {   
     161                if((*p != '\r') && (*p != '\n')) { 
     162                    if(((*p >= 0x80) || (*p < 0x20)) && (*p != '\t')) { 
     163                        buf[idx] = '?'; 
     164                    } else { 
     165                        buf[idx] = *p; 
     166                    } 
     167                    p++, idx++, len--; 
     168                    continue; 
     169                } 
     170                p++, len--; 
     171            } 
     172            if(idx) { 
     173                buf[idx] = 0; 
     174                rprint(txtbuf, txtlen,"%s\n", buf); 
     175                idx = 0; 
     176            } 
     177        } 
     178        if(idx) {  
     179            rprint(txtbuf, txtlen,"%s\n", buf); 
     180        } 
     181        /*--- rprint(txtbuf, txtlen,"---------------------------------------------------------------------\n"); ---*/ 
     182    } 
     183#endif/*--- #if defined(CONFIG_TFFS_PANIC_LOG) && defined(ATH_SRAM_PRINTKLEN) ---*/ 
     184    return txtbuf - txtstart; 
     185} 
     186/*--------------------------------------------------------------------------------*\ 
     187\*--------------------------------------------------------------------------------*/ 
     188void ath_inval_log_from_ram(void) { 
     189#if defined(CONFIG_TFFS_PANIC_LOG) && defined(ATH_SRAM_PRINTKLEN) 
     190    struct _ram_print_data *psram_print = (struct _ram_print_data *)ATH_REBOOT_LOGBUFFER; 
     191    psram_print->magic_word = 0; 
     192#endif/*--- #if defined(CONFIG_TFFS_PANIC_LOG) && defined(ATH_SRAM_PRINTKLEN) ---*/ 
     193} 
     194/*--------------------------------------------------------------------------------*\ 
     195\*--------------------------------------------------------------------------------*/ 
     196static void ath_save_rebootstatus_to_ram(unsigned int idx) { 
     197    struct _ram_print_data *pram_print = (struct _ram_print_data *)ATH_REBOOT_LOGBUFFER; 
     198     
     199    if(!MAGIC_REBOOT_STATUS_WORD_CHECK(pram_print->rebootstatus)) { 
     200        pram_print->rebootstatus = MAGIC_REBOOT_STATUS_WORD_SET(idx); 
     201    } 
     202} 
     203/*--------------------------------------------------------------------------------*\ 
     204\*--------------------------------------------------------------------------------*/ 
     205static int ath_reboot_status_from_ram(void) { 
     206    struct _ram_print_data *pram_print = (struct _ram_print_data *)ATH_REBOOT_LOGBUFFER; 
     207    unsigned int status = RS_NMI_PON; 
     208 
     209    if(MAGIC_REBOOT_STATUS_WORD_CHECK(pram_print->rebootstatus)) { 
     210        status =  pram_print->rebootstatus & 0xF; 
     211        pram_print->rebootstatus = 0x0; 
     212    } 
     213    if((status >= sizeof(reboot_status) / sizeof(reboot_status[0]))) { 
     214        status = sizeof(reboot_status) / sizeof(reboot_status[0]) - 1; 
     215    } 
     216    printk(KERN_ERR"(c) AVM 2013, Reboot Status is: %s\n", reboot_status[status]); 
     217    /*--- ath_restore_log_from_ram(NULL, 0); ---*/ 
     218    return 0; 
     219} 
     220arch_initcall(ath_reboot_status_from_ram); 
     221 
     222/*------------------------------------------------------------------------------------------*\ 
     223\*------------------------------------------------------------------------------------------*/ 
     224void set_reboot_status_to_NMI(void) { 
     225    ath_save_rebootstatus_to_ram(RS_SOFT_WATCHDOG); 
     226} 
     227/*------------------------------------------------------------------------------------------*\ 
     228\*------------------------------------------------------------------------------------------*/ 
     229void set_reboot_status_to_Update(void) { 
     230    ath_save_rebootstatus_to_ram(RS_FIRMWARE_UPDATE); 
     231} 
     232/*------------------------------------------------------------------------------------------*\ 
     233\*------------------------------------------------------------------------------------------*/ 
     234void set_reboot_status_to_NMI_WA(void) { 
     235    ath_save_rebootstatus_to_ram(RS_NMI_WA); 
     236} 
     237/*------------------------------------------------------------------------------------------*\ 
     238\*------------------------------------------------------------------------------------------*/ 
     239void set_reboot_status_to_BusError(void) { 
     240    ath_save_rebootstatus_to_ram(RS_BUS_ERROR); 
     241} 
     242/*------------------------------------------------------------------------------------------*\ 
     243\*------------------------------------------------------------------------------------------*/ 
     244void set_reboot_status_to_SoftReboot(void) { 
     245    ath_save_rebootstatus_to_ram(RS_SOFT_REBOOT); 
     246} 
  • .6.32/arch/mips/include/asm/mach-atheros/934x.h

    diff -burN 7362_linux-2.6.32/arch/mips/include/asm/mach-atheros/934x.h 7320_linux-2.6.32/arch/mips/include/asm/mach-atheros/934x.h
    old new  
    26532653#define PCIE_PLL_CONFIG_REFDIV_GET(x)                                (((x) & PCIE_PLL_CONFIG_REFDIV_MASK) >> PCIE_PLL_CONFIG_REFDIV_LSB) 
    26542654#define PCIE_PLL_CONFIG_REFDIV_SET(x)                                (((x) << PCIE_PLL_CONFIG_REFDIV_LSB) & PCIE_PLL_CONFIG_REFDIV_MASK) 
    26552655#define PCIE_PLL_CONFIG_REFDIV_RESET                                 1 
    2656 #define PCIE_PLL_CONFIG_ADDRESS                                      0x0010 
    26572656#define PCIE_PLL_CONFIG_OFFSET                                       0x0010 
    26582657// SW modifiable bits 
    26592658#define PCIE_PLL_CONFIG_SW_MASK                                      0xc0017c00 
     
    26872686#define PCIE_PLL_DITHER_DIV_MAX_DIV_MAX_FRAC_GET(x)                  (((x) & PCIE_PLL_DITHER_DIV_MAX_DIV_MAX_FRAC_MASK) >> PCIE_PLL_DITHER_DIV_MAX_DIV_MAX_FRAC_LSB) 
    26882687#define PCIE_PLL_DITHER_DIV_MAX_DIV_MAX_FRAC_SET(x)                  (((x) << PCIE_PLL_DITHER_DIV_MAX_DIV_MAX_FRAC_LSB) & PCIE_PLL_DITHER_DIV_MAX_DIV_MAX_FRAC_MASK) 
    26892688#define PCIE_PLL_DITHER_DIV_MAX_DIV_MAX_FRAC_RESET                   16383 
    2690 #define PCIE_PLL_DITHER_DIV_MAX_ADDRESS                              0x0014 
    26912689#define PCIE_PLL_DITHER_DIV_MAX_OFFSET                               0x0014 
    26922690// SW modifiable bits 
    26932691#define PCIE_PLL_DITHER_DIV_MAX_SW_MASK                              0xc01ffffe 
     
    27122710#define PCIE_PLL_DITHER_DIV_MIN_DIV_MIN_FRAC_GET(x)                  (((x) & PCIE_PLL_DITHER_DIV_MIN_DIV_MIN_FRAC_MASK) >> PCIE_PLL_DITHER_DIV_MIN_DIV_MIN_FRAC_LSB) 
    27132711#define PCIE_PLL_DITHER_DIV_MIN_DIV_MIN_FRAC_SET(x)                  (((x) << PCIE_PLL_DITHER_DIV_MIN_DIV_MIN_FRAC_LSB) & PCIE_PLL_DITHER_DIV_MIN_DIV_MIN_FRAC_MASK) 
    27142712#define PCIE_PLL_DITHER_DIV_MIN_DIV_MIN_FRAC_RESET                   14749 
    2715 #define PCIE_PLL_DITHER_DIV_MIN_ADDRESS                              0x0018 
    27162713#define PCIE_PLL_DITHER_DIV_MIN_OFFSET                               0x0018 
    27172714// SW modifiable bits 
    27182715#define PCIE_PLL_DITHER_DIV_MIN_SW_MASK                              0x001ffffe 
     
    27402737#define PCIE_PLL_DITHER_STEP_STEP_FRAC_GET(x)                        (((x) & PCIE_PLL_DITHER_STEP_STEP_FRAC_MASK) >> PCIE_PLL_DITHER_STEP_STEP_FRAC_LSB) 
    27412738#define PCIE_PLL_DITHER_STEP_STEP_FRAC_SET(x)                        (((x) << PCIE_PLL_DITHER_STEP_STEP_FRAC_LSB) & PCIE_PLL_DITHER_STEP_STEP_FRAC_MASK) 
    27422739#define PCIE_PLL_DITHER_STEP_STEP_FRAC_RESET                         10 
    2743 #define PCIE_PLL_DITHER_STEP_ADDRESS                                 0x001c 
    27442740#define PCIE_PLL_DITHER_STEP_OFFSET                                  0x001c 
    27452741// SW modifiable bits 
    27462742#define PCIE_PLL_DITHER_STEP_SW_MASK                                 0xf1fffffe 
     
    27802776#define LDO_POWER_CONTROL_SELECT_DDR1_GET(x)                         (((x) & LDO_POWER_CONTROL_SELECT_DDR1_MASK) >> LDO_POWER_CONTROL_SELECT_DDR1_LSB) 
    27812777#define LDO_POWER_CONTROL_SELECT_DDR1_SET(x)                         (((x) << LDO_POWER_CONTROL_SELECT_DDR1_LSB) & LDO_POWER_CONTROL_SELECT_DDR1_MASK) 
    27822778#define LDO_POWER_CONTROL_SELECT_DDR1_RESET                          0 
    2783 #define LDO_POWER_CONTROL_ADDRESS                                    0x0020 
    27842779#define LDO_POWER_CONTROL_OFFSET                                     0x0020 
    27852780// SW modifiable bits 
    27862781#define LDO_POWER_CONTROL_SW_MASK                                    0x0000003f 
     
    28762871#define CURRENT_PCIE_PLL_DITHER_FRAC_GET(x)                          (((x) & CURRENT_PCIE_PLL_DITHER_FRAC_MASK) >> CURRENT_PCIE_PLL_DITHER_FRAC_LSB) 
    28772872#define CURRENT_PCIE_PLL_DITHER_FRAC_SET(x)                          (((x) << CURRENT_PCIE_PLL_DITHER_FRAC_LSB) & CURRENT_PCIE_PLL_DITHER_FRAC_MASK) 
    28782873#define CURRENT_PCIE_PLL_DITHER_FRAC_RESET                           0 
    2879 #define CURRENT_PCIE_PLL_DITHER_ADDRESS                              0x0028 
    28802874#define CURRENT_PCIE_PLL_DITHER_OFFSET                               0x0028 
    28812875// SW modifiable bits 
    28822876#define CURRENT_PCIE_PLL_DITHER_SW_MASK                              0x001fbfff 
     
    29402934#define ETH_XMII_PHASE0_COUNT_GET(x)                                 (((x) & ETH_XMII_PHASE0_COUNT_MASK) >> ETH_XMII_PHASE0_COUNT_LSB) 
    29412935#define ETH_XMII_PHASE0_COUNT_SET(x)                                 (((x) << ETH_XMII_PHASE0_COUNT_LSB) & ETH_XMII_PHASE0_COUNT_MASK) 
    29422936#define ETH_XMII_PHASE0_COUNT_RESET                                  1 
    2943 #define ETH_XMII_ADDRESS                                             0x002c 
    29442937#define ETH_XMII_OFFSET                                              0x002c 
    29452938// SW modifiable bits 
    29462939#define ETH_XMII_SW_MASK                                             0xffffffff 
     
    30643057#define CURRENT_AUDIO_PLL_MODULATION_INT_GET(x)                      (((x) & CURRENT_AUDIO_PLL_MODULATION_INT_MASK) >> CURRENT_AUDIO_PLL_MODULATION_INT_LSB) 
    30653058#define CURRENT_AUDIO_PLL_MODULATION_INT_SET(x)                      (((x) << CURRENT_AUDIO_PLL_MODULATION_INT_LSB) & CURRENT_AUDIO_PLL_MODULATION_INT_MASK) 
    30663059#define CURRENT_AUDIO_PLL_MODULATION_INT_RESET                       0 
    3067 #define CURRENT_AUDIO_PLL_MODULATION_ADDRESS                         0x003c 
    30683060#define CURRENT_AUDIO_PLL_MODULATION_OFFSET                          0x003c 
    30693061// SW modifiable bits 
    30703062#define CURRENT_AUDIO_PLL_MODULATION_SW_MASK                         0x0ffffc7e 
     
    31103102#define BB_PLL_CONFIG_NFRAC_GET(x)                                   (((x) & BB_PLL_CONFIG_NFRAC_MASK) >> BB_PLL_CONFIG_NFRAC_LSB) 
    31113103#define BB_PLL_CONFIG_NFRAC_SET(x)                                   (((x) << BB_PLL_CONFIG_NFRAC_LSB) & BB_PLL_CONFIG_NFRAC_MASK) 
    31123104#define BB_PLL_CONFIG_NFRAC_RESET                                    3276 
    3113 #define BB_PLL_CONFIG_ADDRESS                                        0x0040 
    31143105#define BB_PLL_CONFIG_OFFSET                                         0x0040 
    31153106// SW modifiable bits 
    31163107#define BB_PLL_CONFIG_SW_MASK                                        0xff3f3fff 
     
    31503141#define DDR_PLL_DITHER_NFRAC_MAX_GET(x)                              (((x) & DDR_PLL_DITHER_NFRAC_MAX_MASK) >> DDR_PLL_DITHER_NFRAC_MAX_LSB) 
    31513142#define DDR_PLL_DITHER_NFRAC_MAX_SET(x)                              (((x) << DDR_PLL_DITHER_NFRAC_MAX_LSB) & DDR_PLL_DITHER_NFRAC_MAX_MASK) 
    31523143#define DDR_PLL_DITHER_NFRAC_MAX_RESET                               1000 
    3153 #define DDR_PLL_DITHER_ADDRESS                                       0x0044 
    31543144#define DDR_PLL_DITHER_OFFSET                                        0x0044 
    31553145// SW modifiable bits 
    31563146#define DDR_PLL_DITHER_SW_MASK                                       0xffffffff 
     
    31903180#define CPU_PLL_DITHER_NFRAC_MAX_GET(x)                              (((x) & CPU_PLL_DITHER_NFRAC_MAX_MASK) >> CPU_PLL_DITHER_NFRAC_MAX_LSB) 
    31913181#define CPU_PLL_DITHER_NFRAC_MAX_SET(x)                              (((x) << CPU_PLL_DITHER_NFRAC_MAX_LSB) & CPU_PLL_DITHER_NFRAC_MAX_MASK) 
    31923182#define CPU_PLL_DITHER_NFRAC_MAX_RESET                               60 
    3193 #define CPU_PLL_DITHER_ADDRESS                                       0x0048 
    31943183#define CPU_PLL_DITHER_OFFSET                                        0x0048 
    31953184// SW modifiable bits 
    31963185#define CPU_PLL_DITHER_SW_MASK                                       0x80ffffff 
     
    39153904        ATH_PCI_CTRL_DESCRIPTOR(0) 
    39163905#   undef ATH_PCI_RC2_IRQ 
    39173906 
     3907#define ATH_PCIE_PHY_REG1        0x18116CC0 
     3908#define ATH_PCIE_PHY_REG2        0x18116CC4 
     3909#define ATH_PCIE_PHY_REG3        0x18116CC8 
     3910 
     3911#define ATH_PCIE_EP_PHY_REG1     0x18116D00 
     3912#define ATH_PCIE_EP_PHY_REG2     0x18116D04 
     3913#define ATH_PCIE_EP_PHY_REG3     0x18116D08 
     3914 
     3915 
    39183916#if defined(CONFIG_NMI_ARBITER_WORKAROUND) 
    39193917 
    39203918#define ATH_SRAM_BASE_UNCACHED  0xbd000000 
  • .6.32/arch/mips/pci/pci-ath.c

    diff -burN 7362_linux-2.6.32/arch/mips/pci/pci-ath.c 7320_linux-2.6.32/arch/mips/pci/pci-ath.c
    old new  
    314314         */ 
    315315        if (!(ath_reg_rd(pcie_reset[i]) & PCIE_RESET_LINK_UP_MASK)) { 
    316316            printk("***** Warning PCIe %d H/W not found !!!\n", i); 
     317 
     318#if defined(CONFIG_MACH_QCA955x) 
     319            ath_reg_wr(0x18116dc0, 0x1061060e);     /*--- change PCIE to reduce power about 18mA ---*/ 
     320#endif 
     321            ath_reg_wr_nf(ATH_PCIE_PLL_CONFIG, 
     322                PCIE_PLL_CONFIG_REFDIV_SET(1) | 
     323                PCIE_PLL_CONFIG_BYPASS_SET(1) | 
     324                PCIE_PLL_CONFIG_PLLPWD_SET(1)); 
     325 
    317326            return 0; 
    318327        } else { 
    319328            ath_pci_link[i] = 1; 
  • .6.32/drivers/char/avm_new/ar7wdt_main.c

    diff -burN 7362_linux-2.6.32/drivers/char/avm_new/ar7wdt_main.c 7320_linux-2.6.32/drivers/char/avm_new/ar7wdt_main.c
    old new  
    4141#include <linux/mm.h> 
    4242#include <linux/vmstat.h> 
    4343 
     44static void AVM_WATCHDOG_check_all_triggered(void); 
    4445 
    4546/*-----------------------------------------------------------------------------------------------*\ 
    4647\*-----------------------------------------------------------------------------------------------*/ 
     
    491492    ar7wdt_data.appl[handle].pagefaults  = get_act_pagefaults(); 
    492493    /*--- timer neu aufsetzen ---*/ 
    493494    _AVM_WATCHDOG_ctrl_timer(AVM_WATCHDOG_DEL_TIMER | AVM_WATCHDOG_SET_TIMER, handle); 
     495    AVM_WATCHDOG_check_all_triggered(); 
    494496 
    495497#if defined(WATCHDOG_LIST_TASK_STATISTIC) 
    496498    show_task_statistic(); 
     
    746748    saved_printk = printk; 
    747749    set_printk(__printk); /*--- folgende Ausgaben sofort ausgeben: ---*/ 
    748750    /*--- printk("utime_sum: %lld unorm %d\n", utime_sum, unorm); ---*/ 
    749     printk(KERN_EMERG "[%lu][%x]AVM_WATCHDOG_reboot(hdl=%u, name=%s): reboot (current: %s pgfault %lu)\n",  
     751    printk(KERN_EMERG "[%lu]AVM_WATCHDOG_reboot(hdl=%u, name=%s): reboot (current: %s pgfault %lu)\n",  
    750752                                    jiffies, 
    751                                     smp_processor_id(), 
    752753                                    notrigger_handle + 1, ar7wdt_data.appl[notrigger_handle].Name,  
    753754                                    current->comm, 
    754755                                    current->signal->cmaj_flt 
     
    868869        return -EINVAL; /*--- inval argument ---*/ 
    869870    } 
    870871    if(ar7wdt_data.states & (1 << handle)) { 
    871         struct task_struct *hungtask; 
    872         if(!ar7wdt_no_reboot) { 
    873             ar7wdt_hw_trigger(); 
    874         } 
    875         hungtask = watchdog_task_list(handle); 
     872        struct task_struct *hungtask = watchdog_task_list(handle); 
    876873#ifdef CONFIG_SCHEDSTATS 
    877874        if (ar7wdt_no_reboot == 1) { 
    878875#if KERNEL_VERSION(2, 6, 19) >= LINUX_VERSION_CODE 
     
    935932                }  
    936933            } 
    937934#endif        
    938             AVM_WATCHDOG_deinit(); 
    939935            init_timer(&PanicTimer); 
    940936            PanicTimer.data     = (unsigned long)hungtask; 
    941937            PanicTimer.function = panic_function; 
     
    950946 
    951947/*------------------------------------------------------------------------------------------*\ 
    952948\*------------------------------------------------------------------------------------------*/ 
     949static void AVM_WATCHDOG_check_all_triggered(void) { 
     950    int i; 
     951    unsigned int mask    = 0; 
     952    unsigned int trigger = 0; 
     953    unsigned long flags; 
     954 
     955    spin_lock_irqsave(&ar7_wdt_lock, flags); 
     956    for( i = 0 ; i < MAX_WDT_APPLS ; i++) { 
     957        if(ar7wdt_data.mask & (1 << i)) { 
     958            mask |= 1 << i; 
     959            if(ar7wdt_data.triggered & (1 << i)) { 
     960                trigger |= 1 << i; 
     961            } 
     962        } 
     963    } 
     964    if(mask == trigger) { 
     965        ar7wdt_data.triggered = 0; 
     966        spin_unlock_irqrestore(&ar7_wdt_lock, flags); 
     967        ar7wdt_hw_trigger(); 
     968    } else { 
     969        spin_unlock_irqrestore(&ar7_wdt_lock, flags); 
     970        DBG(KERN_INFO "%s(): not triggered mask 0x%x\n", __func__, mask ^ trigger); 
     971    } 
     972} 
     973/*------------------------------------------------------------------------------------------*\ 
     974\*------------------------------------------------------------------------------------------*/ 
    953975static void AVM_WATCHDOG_timer_handler_action(unsigned int handle) { 
    954976    unsigned long flags; 
    955977    spin_lock_irqsave(&ar7_wdt_lock, flags); 
  • .6.32/drivers/char/avm_new/ath_wdt.c

    diff -burN 7362_linux-2.6.32/drivers/char/avm_new/ath_wdt.c 7320_linux-2.6.32/drivers/char/avm_new/ath_wdt.c
    old new  
    7373#endif/*--- #if defined(CONFIG_NMI_ARBITER_WORKAROUND) ---*/ 
    7474    { 
    7575        ath_reg_wr(ATH_WATCHDOG_TMR, (TIME_OUT_SECS * ath_ahb_freq)); 
     76#if defined(CONFIG_MACH_AR724x) 
    7677        ath_reg_wr(ATH_WATCHDOG_TMR_CONTROL, ATH_WD_ACT_RESET); 
     78#else 
     79        ath_reg_wr(ATH_WATCHDOG_TMR_CONTROL, ATH_WD_ACT_NMI); 
     80#endif 
    7781    } 
    7882    DBG_ERR( "[ath:watchdog] action: %u (hardware reset) - ticks: %u (= %u seconds * %u hz)\n",  
    7983            ath_reg_rd(ATH_WATCHDOG_TMR_CONTROL),  
  • .6.32/drivers/char/avm_new/ifxmips_wdt.h

    diff -burN 7362_linux-2.6.32/drivers/char/avm_new/ifxmips_wdt.h 7320_linux-2.6.32/drivers/char/avm_new/ifxmips_wdt.h
    old new  
    11#ifndef _ifxmips_wdt_h_ 
    22#define _ifxmips_wdt_h_ 
    33 
    4 #define WDT_TIMEOUT_SEC 25 
     4#define WDT_TIMEOUT_SEC 10 
    55 
    66#define IFX_WDT_PW1 0x000000BE /**< First password for access */ 
    77#define IFX_WDT_PW2 0x000000DC /**< Second password for access */ 
  • .6.32/drivers/char/avm_new/Makefile

    diff -burN 7362_linux-2.6.32/drivers/char/avm_new/Makefile 7320_linux-2.6.32/drivers/char/avm_new/Makefile
    old new  
    11############################################# 
    22# Makefile: automaticly genereated by ./init_avm 
    3 #           Mo 9. Dez 18:24:14 CET 2013 
     3#           Fr 25. Apr 17:45:21 CEST 2014 
    44############################################# 
    55 
    66##################################################################################### 
  • .6.32/drivers/char/avm_power/avm_power_file.c

    diff -burN 7362_linux-2.6.32/drivers/char/avm_power/avm_power_file.c 7320_linux-2.6.32/drivers/char/avm_power/avm_power_file.c
    old new  
    269269#endif/*--- #if defined(CONFIG_MIPS_UR8) ---*/ 
    270270    { NULL, 0, 0 } 
    271271}; 
    272  
     272/*-------------------------------------------------------------------------------------*\ 
     273\*-------------------------------------------------------------------------------------*/ 
     274static struct _power_managment_dest_entry multicast_profile_on[] =  { 
     275    { "avm_event", AVM_PM_CB_IGNORE, LOAD_CONTROL_MULTICAST | 0x1 },                   /*--- Loadcontrols setzt LOAD_CONTROL_MULTICAST ---*/ 
     276    { NULL, 0, 0 } 
     277}; 
     278/*-------------------------------------------------------------------------------------*\ 
     279\*-------------------------------------------------------------------------------------*/ 
     280static struct _power_managment_dest_entry multicast_profile_off[] =  { 
     281    { "avm_event", AVM_PM_CB_IGNORE, LOAD_CONTROL_MULTICAST | 0x0 },                   /*--- Loadcontrols ruecksetzen LOAD_CONTROL_MULTICAST ---*/ 
     282    { NULL, 0, 0 } 
     283}; 
     284/*-------------------------------------------------------------------------------------*\ 
     285\*-------------------------------------------------------------------------------------*/ 
     286static struct _power_managment_dest_entry voip_profile_on[] =  { 
     287    { "avm_event", AVM_PM_CB_IGNORE, LOAD_CONTROL_VOIPCALL | 0x1 },                   /*--- Loadcontrols setzt LOAD_CONTROL_MULTICAST ---*/ 
     288    { NULL, 0, 0 } 
     289}; 
     290/*-------------------------------------------------------------------------------------*\ 
     291\*-------------------------------------------------------------------------------------*/ 
     292static struct _power_managment_dest_entry voip_profile_off[] =  { 
     293    { "avm_event", AVM_PM_CB_IGNORE, LOAD_CONTROL_VOIPCALL | 0x0 },                   /*--- Loadcontrols ruecksetzen LOAD_CONTROL_MULTICAST ---*/ 
     294    { NULL, 0, 0 } 
     295}; 
    273296/*--------------------------------------------------------------------------------*\ 
    274297\*--------------------------------------------------------------------------------*/ 
    275298static struct _power_managment_dest_entry usbcurrentreq_entries[] =  { 
     
    328351    { "isdn",  AVM_PM_CB_FAILED, 0x21 },         /*--- ueber PCM-Register anschalten ---*/ 
    329352    { NULL, 0, 0 } 
    330353}; 
    331 #endif/*--- #if defined(CONFIG_MIPS_UR8) ---*/ 
    332354/*--------------------------------------------------------------------------------*\ 
    333355\*--------------------------------------------------------------------------------*/ 
    334356static struct _power_managment_dest_entry speedstep_status_entries[] =  { 
    335357    { "speedstep",AVM_PM_CB_UNINSTALLED_OR_FAILED, 0x40 },        /*---  Speedstep Status abfragen ! ---*/ 
    336358    { NULL, 0, 0 } 
    337359}; 
     360#endif/*--- #if defined(CONFIG_MIPS_UR8) ---*/ 
    338361/*--------------------------------------------------------------------------------*\ 
    339362\*--------------------------------------------------------------------------------*/ 
    340363static struct _power_managment_dest_entry pcmlinkbus_stop_entries[] =  { 
     
    418441    { "ata",                    atamode_entries,        PM_ACESS_ALL}, 
    419442    { "vdsl",                   vdslmode_entries,       PM_ACESS_ALL},        /*--- im VDSL-Mode DSL auf ATA stellen ---*/ 
    420443    { "update",                 updatemode_entries,     PM_ACESS_ALL}, 
    421     { "speedstep_status",       speedstepstatus_entries,PM_ACESS_APPL}, 
    422444    { "speedstep_on",           speedstepon_entries,    PM_ACESS_APPL}, 
    423445    { "speedstep_off",          speedstepoff_entries,   PM_ACESS_APPL}, 
    424446    { "telefon_profile_on",     telefon_profile_on,     PM_ACESS_ALL},   /*--- schalte auf normalspeed - niemals runter  ---*/  
    425447    { "telefon_profile_off",    telefon_profile_off,    PM_ACESS_ALL},   /*--- vorhergehendes Profil ---*/ 
     448    { "multicast_profile_on",   multicast_profile_on,   PM_ACESS_ALL},   /*--- signalisiert das Multicast an ---*/  
     449    { "multicast_profile_off",  multicast_profile_off,  PM_ACESS_ALL},   /*--- signalisiert, dass Multicast aus ---*/ 
     450    { "voip_profile_on",        voip_profile_on,        PM_ACESS_ALL},   /*--- signalisiert das Voip an ---*/  
     451    { "voip_profile_off",       voip_profile_off,       PM_ACESS_ALL},   /*--- signalisiert, dass Voip aus ---*/ 
    426452#if defined(CONFIG_MIPS_UR8) 
    427453    { "usb_poweron",            usbpoweron_entries,       PM_ACESS_ALL}, 
    428454    { "usb_poweroff",           usbpoweroff_entries,      PM_ACESS_ALL}, 
     
    434460    { "powerup_slic2",          powerup_slic2_entries,    PM_ACESS_ALL}, 
    435461    { "wlan_booston",           powerup_wlan_entries,     PM_ACESS_ALL},    /*--- anheben der Spannung 7212 auf 1.2V ---*/ 
    436462    { "wlan_boostoff",          powerdown_wlan_entries,   PM_ACESS_ALL}, 
     463    { "speedstep_status",       speedstep_status_entries, PM_ACESS_ALL}, 
     464#else 
     465    { "speedstep_status",       speedstepstatus_entries,PM_ACESS_APPL}, 
    437466#endif/*--- #if defined(CONFIG_MIPS_UR8) ---*/ 
    438467    { "usb_current_req",        usbcurrentreq_entries,    PM_ACESS_ALL}, 
    439     { "speedstep_status",       speedstep_status_entries, PM_ACESS_ALL}, 
    440468    { "pcmlink_bus_off",        pcmlinkbus_stop_entries,  PM_ACESS_DRIVER}, 
    441469    { "pcmlink_bus_on",         pcmlinkbus_start_entries, PM_ACESS_DRIVER}, 
    442470    { "pots_load",              pots_load_entries,        PM_ACESS_ALL}, 
     
    11891217\*--------------------------------------------------------------------------------*/ 
    11901218static int avm_power_event_Callback(int state){ 
    11911219    /*--- printk("avm_power_event_Callback: %d\n", state); ---*/ 
     1220    if(state & LOAD_CONTROL_VOIPCALL) { 
     1221        avm_powermanager_load_control_setflags(state & 0x1 ? LOAD_CONTROL_VOIPCALL : 0 , LOAD_CONTROL_VOIPCALL); 
     1222        return 0; 
     1223    } 
     1224    if(state & LOAD_CONTROL_MULTICAST) { 
     1225        avm_powermanager_load_control_setflags(state & 0x1 ? LOAD_CONTROL_MULTICAST : 0 , LOAD_CONTROL_MULTICAST); 
     1226        return 0; 
     1227    } 
    11921228    if(telefonevent.on != (unsigned)state) { 
    11931229        telefonevent.on = state; 
    11941230#if defined(DECTSYNC_PATCH)  
     
    18401876        } 
    18411877        pm_info->stat.rate_usbhostact    = (unsigned char) usbmwatt; 
    18421878        pm_info->stat.usb_status         = PM_GET_RATE(pm_info->deviceinfo[powerdevice_usb_client].power_rate) ? 1 : 0;  /*--- USB-Client connected ---*/ 
    1843         pm_info->stat.rate_lteact        = PM_GET_RATE(pm_info->deviceinfo[powerdevice_lte].power_rate);                 /*--- aktueller Verbrauch LTE Prozent ---*/ 
     1879        pm_info->stat.rate_lteact        = PM_GET_NORM_MWATT(&pm_info->deviceinfo[powerdevice_lte]);                 /*--- aktueller Verbrauch LTE Prozent ---*/ 
    18441880        avm_power_speedstep_mode(); 
    18451881#if 0 
    18461882        printk(KERN_DEBUG"SUM:%d(%d) SYST:%d(%d)-%x DSP:%d(%d) WLAN:%d(%d)-%d-%x ETH:%d(%d)-%x ISDN:%x AB:%d(%d) DECT:%d(%d) USB:%d(%d)-%x TEMP(%d, %d min %d max %d) want:%d\n", 
     
    20552091    } 
    20562092    return run / NR_CPUS; 
    20572093} 
     2094#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32) 
     2095/** 
     2096 * get_avenrun - get the load average array 
     2097 * @loads:  pointer to dest load array 
     2098 * @offset: offset to add 
     2099 * @shift:  shift count to shift the result left 
     2100 * 
     2101 * These values are estimates at best, so no need for locking. 
     2102 */ 
     2103void get_avenrun(unsigned long *loads, unsigned long offset, int shift) { 
     2104    loads[0] = (avenrun[0] + offset) << shift; 
     2105    loads[1] = (avenrun[1] + offset) << shift; 
     2106    loads[2] = (avenrun[2] + offset) << shift; 
     2107} 
     2108#endif/*--- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32) ---*/ 
     2109 
     2110#define LOAD_INT(x) ((x) >> FSHIFT) 
     2111#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100) 
     2112 
    20582113/*--------------------------------------------------------------------------------*\ 
    20592114 * Funktion wird von Treibern aufgerufen um Infos ueber den aktuellen Power-Status zu liefern 
    20602115\*--------------------------------------------------------------------------------*/ 
     
    21192174#if defined(DECTSYNC_PATCH) 
    21202175            if(display_dectsync(pm_ressourceinfo.loadcntrl)) { 
    21212176#endif/*--- #else ---*//*--- #if defined(DECTSYNC_PATCH) ---*/ 
     2177                unsigned long avnrun[3]; 
     2178                get_avenrun(avnrun, FIXED_1/200, 0); 
    21222179#if NR_CPUS == 2 
    2123                 printk(KERN_ERR"idle: %d/%d %%(%d/%d %%) loadcntrl %d\n",  
     2180                printk(KERN_ERR"idle: %d/%d %%(%d/%d %%) loadavg %lu.%lu %lu.%lu %lu.%lu loadcntrl 0x%x\n",  
    21242181                                       100 - ((cpus_loadrate >> 0) & 0xFF), 100 - ((cpus_loadrate >> 8) & 0xFF),  
    21252182                                       (cpus_loadrate >> 0) & 0xFF, (cpus_loadrate >> 8) & 0xFF,  
     2183                                       LOAD_INT(avnrun[0]), LOAD_FRAC(avnrun[0]), 
     2184                                       LOAD_INT(avnrun[1]), LOAD_FRAC(avnrun[1]), 
     2185                                       LOAD_INT(avnrun[2]), LOAD_FRAC(avnrun[2]), 
    21262186                                       pm_ressourceinfo.loadcntrl 
    21272187                                       ); 
    21282188#else 
    2129                 printk(KERN_ERR"[%lu]idle: %d %%(%d %%) loadcntrl %d\n", jiffies, 100 - power_rate, power_rate, pm_ressourceinfo.loadcntrl); 
     2189                printk(KERN_ERR"[%lu]idle: %d %%(%d %%) loadavg %lu.%lu %lu.%lu %lu.%lu loadcntrl 0x%x\n", jiffies,  
     2190                                    100 - power_rate, power_rate,  
     2191                                    LOAD_INT(avnrun[0]), LOAD_FRAC(avnrun[0]), 
     2192                                    LOAD_INT(avnrun[1]), LOAD_FRAC(avnrun[1]), 
     2193                                    LOAD_INT(avnrun[2]), LOAD_FRAC(avnrun[2]), 
     2194                                    pm_ressourceinfo.loadcntrl); 
    21302195#endif 
    21312196 
    21322197#if defined(DECTSYNC_PATCH) 
  • .6.32/drivers/char/avm_power/avm_power.h

    diff -burN 7362_linux-2.6.32/drivers/char/avm_power/avm_power.h 7320_linux-2.6.32/drivers/char/avm_power/avm_power.h
    old new  
    110110}; 
    111111void avm_powermanager_load_control_set(enum _load_control_set mode, int scale); 
    112112int avm_powermanager_load_control_handler(int run); 
     113void avm_powermanager_load_control_setflags(unsigned int value, unsigned int mask); 
    113114 
    114115#ifdef CONFIG_AVM_POWERMETER 
    115116/*--------------------------------------------------------------------------------*\ 
  • .6.32/drivers/char/avm_power/avm_power_loadcontrol.c

    diff -burN 7362_linux-2.6.32/drivers/char/avm_power/avm_power_loadcontrol.c 7320_linux-2.6.32/drivers/char/avm_power/avm_power_loadcontrol.c
    old new  
    3939    enum _load_control_set loadcontrol_mode; 
    4040    int countdown; 
    4141    int load_control_val; 
     42    unsigned int load_control_flags; 
     43    int load_control_status; 
    4244    int load_control_scale; 
    4345} PwLoadControl; 
    4446 
     
    4648 
    4749/*--------------------------------------------------------------------------------*\ 
    4850\*--------------------------------------------------------------------------------*/ 
    49 inline static void lavm_powermanager_load_control_setmoduleval(int val) { 
     51static inline void lavm_powermanager_load_control_setmoduleval(struct _power_managment_loadcontrol *pwlc, int val) { 
    5052    struct _power_managment_loadcontrol_modules *module; 
    51     struct _power_managment_loadcontrol *pwlc = &PwLoadControl; 
    52     unsigned long flags; 
    5353 
    54     /*--- printk("[%d][%s] %d\n", jiffies, __func__, val); ---*/ 
    55     spin_lock_irqsave(&lock, flags); 
     54 
     55    /*--- printk(KERN_INFO"[%s] %x\n", __func__, val); ---*/ 
    5656    module = (struct _power_managment_loadcontrol_modules *)pwlc->anchor; 
    5757    while(module) { 
    5858        module->load_control_callback(val, module->context); 
    5959        module = module->next; 
    6060    } 
    61     spin_unlock_irqrestore(&lock, flags); 
    6261} 
    6362/*--------------------------------------------------------------------------------*\ 
    6463 * mode: 0 auto 
     
    6665\*--------------------------------------------------------------------------------*/ 
    6766void avm_powermanager_load_control_set(enum _load_control_set mode, int scale) { 
    6867    struct _power_managment_loadcontrol *pwlc = &PwLoadControl; 
     68    unsigned long flags; 
    6969    int erg; 
    7070 
    7171    if(mode >= load_control_off) { 
    7272        erg = min(10, (int)(mode - load_control_off)); 
    73         printk(KERN_INFO"[loadcontrol] set level to %d\n", erg); 
     73        erg |= scale;   /*--- hier als scale = flag ---*/ 
     74        printk(KERN_INFO"[loadcontrol] set level to %x\n", erg); 
    7475    } else { 
    7576        pwlc->load_control_scale = min(8, max(0, scale)); 
    7677        printk(KERN_INFO"[loadcontrol] set auto - scale=%d\n", pwlc->load_control_scale); 
    7778        erg = 0; 
    7879    } 
    79     lavm_powermanager_load_control_setmoduleval(erg); 
     80    spin_lock_irqsave(&lock, flags); 
     81    lavm_powermanager_load_control_setmoduleval(pwlc, erg); 
    8082    pwlc->loadcontrol_mode   = mode; 
     83    spin_unlock_irqrestore(&lock, flags); 
    8184} 
    8285/*--------------------------------------------------------------------------------*\ 
    8386\*--------------------------------------------------------------------------------*/ 
    8487int avm_powermanager_load_control_handler(int run) { 
    8588    struct _power_managment_loadcontrol *pwlc = &PwLoadControl; 
     89    unsigned long flags; 
    8690    int load_control_val; 
    8791 
    8892    if(pwlc->loadcontrol_mode != load_control_auto) { 
     
    9498        pwlc->countdown = max(pwlc->countdown - ((100 - run) >> 1), 0); 
    9599    } 
    96100    load_control_val = pwlc->countdown >> pwlc->load_control_scale; 
    97     /*--- printk("[%lu][%s] run=%d countdown=%d val=%d\n", jiffies, __func__, run, pwlc->countdown, load_control_val); ---*/ 
    98  
     101    /*--- printk(KERN_INFO"[%s] run=%d countdown=%d val=%d\n", __func__, run, pwlc->countdown, load_control_val); ---*/ 
     102    spin_lock_irqsave(&lock, flags); 
    99103    if(pwlc->load_control_val != load_control_val) { 
    100104        pwlc->load_control_val = load_control_val; 
    101         lavm_powermanager_load_control_setmoduleval(load_control_val); 
     105        lavm_powermanager_load_control_setmoduleval(pwlc, load_control_val | pwlc->load_control_flags); 
    102106    } 
    103     return load_control_val; 
     107    spin_unlock_irqrestore(&lock, flags); 
     108    return load_control_val | pwlc->load_control_flags; 
    104109} 
    105110/*--------------------------------------------------------------------------------*\ 
    106111 * Callback registrieren 
     
    166171    spin_unlock_irqrestore(&lock, flags); 
    167172} 
    168173EXPORT_SYMBOL(avm_powermanager_load_control_release); 
     174/*--------------------------------------------------------------------------------*\ 
     175 * setze load_reduce-flags (eingeschraenkt durch mask) 
     176 * Achtung! die unteren 4 Bit sind grundsetzlich nicht aenderbar (load_reduce-Wert) ! 
     177\*--------------------------------------------------------------------------------*/ 
     178void avm_powermanager_load_control_setflags(unsigned int value, unsigned int mask){ 
     179    struct _power_managment_loadcontrol *pwlc = &PwLoadControl; 
     180    unsigned long flags; 
     181    unsigned int load_control_flags; 
     182 
     183    /*--- printk(KERN_INFO"[%s] %d\n", __func__, value); ---*/ 
     184    if(pwlc->loadcontrol_mode != load_control_auto) { 
     185        return; 
     186    } 
     187    spin_lock_irqsave(&lock, flags); 
     188    load_control_flags  = pwlc->load_control_flags & ~(mask | LOAD_CONTROL_REDUCEMASK); 
     189    load_control_flags |= value & (mask & ~LOAD_CONTROL_REDUCEMASK); 
     190     
     191    if(load_control_flags != pwlc->load_control_flags) { 
     192        pwlc->load_control_flags = load_control_flags; 
     193        lavm_powermanager_load_control_setmoduleval(pwlc, pwlc->load_control_val | load_control_flags); 
     194    } 
     195    spin_unlock_irqrestore(&lock, flags); 
     196} 
  • .6.32/drivers/char/avm_power/dectsync.c

    diff -burN 7362_linux-2.6.32/drivers/char/avm_power/dectsync.c 7320_linux-2.6.32/drivers/char/avm_power/dectsync.c
    old new  
    436436    if(gdectsync.state < calibrate_timerirq) { 
    437437        return 1; 
    438438    } 
    439     printk(KERN_ERR"[%lu]idle(%d MHz) loadcntrl=%d: %d %%(%d %%) lost %ld wp=%d %% good=%lu.%02lu %% - v/l/t=%lu/%lu/%lu low=%lu us drift=%ld ns\n", 
     439    printk(KERN_ERR"[%lu]idle(%d MHz) loadcntrl=0x%x: %d %%(%d %%) lost %ld wp=%d %% good=%lu.%02lu %% - v/l/t=%lu/%lu/%lu low=%lu us drift=%ld ns\n", 
    440440       jiffies, 
    441441       gdectsync.clk * 2, 
    442442       loadcontrol, 
  • .6.32/drivers/char/avm_power/linux_avm_power.h

    diff -burN 7362_linux-2.6.32/drivers/char/avm_power/linux_avm_power.h 7320_linux-2.6.32/drivers/char/avm_power/linux_avm_power.h
    old new  
    8888/*--------------------------------------------------------------------------------*\ 
    8989 * Load-Control-Callback-Schnittstelle 
    9090 * load_reduce: 0 - 10 (0 keine Lastreduzierung, 10 max. Lastreduzierung)  
     91 * load_reduce: verodert:  LOAD_CONTROL_VOIPCALL 
     92 *                         LOAD_CONTROL_MULTICAST 
    9193 * context:     Pointer der in avm_powermanager_load_control_register angegeben wurde 
    9294\*--------------------------------------------------------------------------------*/ 
     95#define LOAD_CONTROL_REDUCEMASK  0xF 
     96#define LOAD_CONTROL_REDUCE(a)  ((a) & LOAD_CONTROL_REDUCEMASK) 
     97#define LOAD_CONTROL_VOIPCALL   (0x1 << 8) 
     98#define LOAD_CONTROL_MULTICAST  (0x1 << 9) 
     99 
    93100typedef void (*load_control_callback_t)(int load_reduce, void *context); 
    94101/*--------------------------------------------------------------------------------*\ 
    95102 * Callback registrieren 
     
    103110\*--------------------------------------------------------------------------------*/ 
    104111void avm_powermanager_load_control_release(void *handle) __attribute__ ((weak)); 
    105112 
    106  
    107113#define POWERMANAGEMENT_THROTTLE_ETH 
    108114 
    109115/*--------------------------------------------------------------------------------*\ 
     
    159165    powerdevice_usb_host3     = 18,       /*--- power_rate in Milli-Ampere ---*/  
    160166    powerdevice_dsp_loadrate  = 19,       /*--- (ADSL/VDSL-)DSP power_rate in % (100 - % Idle-Wert) ---*/     
    161167    powerdevice_vdsp_loadrate = 20,       /*--- Voice-DSP power_rate in % (100 - % Idle-Wert) ---*/     
    162     powerdevice_lte           = 21,       /*--- power_rate in Milli-Ampere ---*/ 
     168    powerdevice_lte           = 21,       /*--- power_rate in Milliwatt ---*/ 
    163169    powerdevice_maxdevices    = 22 
    164170}; 
    165171 
  • .6.32/drivers/char/tffs-2.0/tffs_local.h

    diff -burN 7362_linux-2.6.32/drivers/char/tffs-2.0/tffs_local.h 7320_linux-2.6.32/drivers/char/tffs-2.0/tffs_local.h
    old new  
    102102    unsigned int init_flag; 
    103103    unsigned int id; 
    104104    unsigned int panic_mode; 
     105    unsigned int kernel_context;    /*--- set kernel_context: only used for tffs_read  ---*/ 
    105106    unsigned char *z_Buffer; 
    106107    unsigned int z_length; 
    107108    z_stream stream; 
  • .6.32/drivers/char/tffs-2.0/tffs_panic.c

    diff -burN 7362_linux-2.6.32/drivers/char/tffs-2.0/tffs_panic.c 7320_linux-2.6.32/drivers/char/tffs-2.0/tffs_panic.c
    old new  
    1818\*------------------------------------------------------------------------------------------*/ 
    1919#include <linux/module.h> 
    2020#include <linux/kernel.h> 
     21#include <linux/version.h> 
    2122#include <linux/init.h> 
    2223#include <linux/proc_fs.h> 
    2324#include <linux/sched.h> 
     
    3233#include <linux/tffs.h> 
    3334#include <linux/zlib.h> 
    3435#include <linux/vmalloc.h> 
     36#include <linux/rtc.h> 
    3537#if defined(CONFIG_PROC_FS) 
    3638#include <linux/proc_fs.h> 
     39#include <linux/seq_file.h> 
    3740#endif /*--- #if defined(CONFIG_PROC_FS) ---*/ 
    3841#include "tffs_local.h" 
    3942 
     43#if defined(CONFIG_MACH_AR934x) 
     44extern int ath_restore_log_from_ram(char *txtbuf, unsigned int txtlen); 
     45extern void ath_inval_log_from_ram(void); 
     46#endif/*--- #if defined(CONFIG_MACH_AR934x) ---*/ 
     47 
    4048unsigned int tffs_spi_mode = 0; 
    4149 
    4250static struct file tffs_panic_file; 
     
    5159    memset(&tffs_panic_inode, 0, sizeof(tffs_panic_inode)); 
    5260 
    5361    tffs_panic_file.f_flags = O_WRONLY; 
    54     tffs_panic_inode.i_rdev = CONFIG_TFFS_PANIC_LOG_ID;   /*--- major muss 0 sein fuer Kernel Mode ---*/ 
     62    tffs_panic_inode.i_rdev = MKDEV(0,CONFIG_TFFS_PANIC_LOG_ID);   /*--- major muss 0 sein fuer Kernel Mode ---*/ 
    5563 
    5664    ret = tffs_open(&tffs_panic_inode, &tffs_panic_file); 
    5765    if(ret) 
     
    7785void tffs_panic_log_register_spi(void) { 
    7886    tffs_spi_mode = 1; 
    7987} 
     88 
     89#if defined(CONFIG_PROC_FS) 
     90static int read_once_cr = 0;  
     91 
     92/*--------------------------------------------------------------------------------*\ 
     93\*--------------------------------------------------------------------------------*/ 
     94static int tffs_panic_log_read(unsigned char *buf, int buf_len) { 
     95    struct _tffs_open *open_data; 
     96    loff_t offp; 
     97    int ret; 
     98    struct file tffs_file; 
     99    struct inode tffs_inode; 
     100    memset(&tffs_file, 0, sizeof(tffs_file)); 
     101    memset(&tffs_inode, 0, sizeof(tffs_inode)); 
     102 
     103    tffs_file.f_flags = O_RDONLY; 
     104    tffs_inode.i_rdev = MKDEV(MAJOR(tffs.device),CONFIG_TFFS_PANIC_LOG_ID); 
     105 
     106    ret = tffs_open(&tffs_inode, &tffs_file); 
     107    if(ret) { 
     108        printk(KERN_ERR"%s tffs_open failed ret=%d\n", __func__, ret); 
     109        return ret; 
     110    } 
     111    open_data = (struct _tffs_open *)tffs_file.private_data; 
     112    open_data->kernel_context = 1;  /*--- readaccess in kernel-context ---*/ 
     113    ret = tffs_read(&tffs_file, buf, buf_len, &offp); 
     114    /*--- printk(KERN_INFO"%s tffs_read ret=%d\n", __func__, ret); ---*/ 
     115    tffs_release(&tffs_inode, &tffs_file); 
     116    return ret; 
     117} 
     118/*--------------------------------------------------------------------------------*\ 
     119\*--------------------------------------------------------------------------------*/ 
     120static unsigned int calc_sum_and_correct(unsigned char *buf, int buf_len) { 
     121    unsigned int i, sum = 0; 
     122    for(i = 0; i < buf_len; i++) { 
     123        if(buf[i] == 0) buf[i] = ' ';   /*--- correct buffer (support null-teminated string) ---*/ 
     124        sum += buf[i]; 
     125    } 
     126    return sum ^ (buf_len << 16); 
     127} 
     128/*--------------------------------------------------------------------------------*\ 
     129\*--------------------------------------------------------------------------------*/ 
     130static char *time_to_ascii(char *buf, int len, char *prefix) { 
     131    static char *month[] = { "Jan",  "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; 
     132    static char *day[]   = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; 
     133    struct rtc_time tm; 
     134    struct timeval now; 
     135    unsigned int local_time; 
     136    do_gettimeofday(&now); 
     137    /*--- local_time = (u32)(now.tv_sec - (sys_tz.tz_minuteswest * 60)); ---*//*---  tz_minuteswest == 0 ?  ---*/ 
     138    local_time = (u32)(now.tv_sec); 
     139    rtc_time_to_tm(local_time, &tm); 
     140    snprintf(buf, len, "%s %s %d %d:%d:%d %d GMT %s", day[tm.tm_wday],  month[tm.tm_mon], tm.tm_mday,  
     141                                                  tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year + 1900, 
     142                                                  prefix 
     143                                                  ); 
     144    return buf; 
     145} 
     146/*--------------------------------------------------------------------------------*\ 
     147\*--------------------------------------------------------------------------------*/ 
     148static int paniclog_show(struct seq_file *seq, void *data __attribute__((unused))) { 
     149 
     150    /*--- printk(KERN_INFO"%s %p %p\n", __func__, seq->private, data); ---*/ 
     151    if(seq->private) { 
     152        seq_printf(seq, "%s", (char *)seq->private); 
     153    } 
     154    return 0; 
     155} 
     156/*--------------------------------------------------------------------------------*\ 
     157\*--------------------------------------------------------------------------------*/ 
     158static int __panicclog_proc_open(struct inode *inode __attribute__((unused)), struct file *file, int *readonce) { 
     159    char crashenv[128]; 
     160    char timebuf[128]; 
     161    char *timestart; 
     162    int buf_len = (0x1 << 17) - 64; /*--- ReserveTimestamp ---*/ 
     163    unsigned int sram_len __attribute__((unused)); 
     164    int len = buf_len; 
     165    unsigned int lastpanic_sum = 0, lastpanic_sram_sum = 0, new_sram_sum = 0, new_sum = 0; 
     166    char *buf; 
     167    if(readonce && *readonce) { 
     168        return -ENODATA; 
     169    } 
     170    buf = kmalloc(len, GFP_KERNEL); 
     171    if(buf == NULL) { 
     172        return -ENOMEM; 
     173    } 
     174    len = sizeof(crashenv); 
     175    crashenv[0] = 0; 
     176    if(TFFS_Read(NULL, FLASH_FS_CRASH, crashenv, &len) == 0) { 
     177        sscanf(crashenv, "0x%x,0x%x,0x%x;", &lastpanic_sum, &lastpanic_sram_sum, &read_once_cr); 
     178    } 
     179    timestart = crashenv; 
     180    /*--- Timestamp extrahieren: ---*/ 
     181    while(*timestart && *timestart != ';') timestart++; 
     182    if(*timestart == ';') timestart++; 
     183 
     184    /*--- printk(KERN_INFO"%s: lastpanic_sum=%x read_once_cr=%x", __func__, lastpanic_sum, read_once_cr); ---*/ 
     185    buf[0] = 0; 
     186    if((len = tffs_panic_log_read(buf, buf_len)) > 0) { 
     187        new_sum = calc_sum_and_correct(buf, len); 
     188        /*--- printk(KERN_INFO"%s: new_sum=%x len=%d\n", __func__, new_sum, len); ---*/ 
     189        if(new_sum != lastpanic_sum) { 
     190            /*--- new panic-log: clear counter ---*/ 
     191            read_once_cr = 0; 
     192            timestart = time_to_ascii(timebuf, sizeof(timebuf), readonce ? "by crash report" : "by support data"); 
     193        } 
     194    } else { 
     195        len = 0; 
     196    } 
     197#if defined(CONFIG_MACH_AR934x) 
     198    sram_len = ath_restore_log_from_ram(buf, buf_len); 
     199    if(sram_len) { 
     200        /*--- prefer sram-log---*/ 
     201        len = sram_len; 
     202        new_sram_sum = calc_sum_and_correct(buf, len); 
     203        /*--- printk(KERN_INFO"%s: prefer sram-trace len=%d", __func__, sram_len); ---*/ 
     204        if(new_sram_sum != lastpanic_sram_sum) { 
     205            struct timeval now; 
     206            /*--- new sram-panic-log: clear counter ---*/ 
     207            read_once_cr = 0; 
     208            timestart = time_to_ascii(timebuf, sizeof(timebuf), readonce ? "by crash report" : "by support data"); 
     209        } 
     210    } 
     211#endif/*--- #if defined(CONFIG_MACH_AR934x) ---*/ 
     212    if(readonce && *readonce) { 
     213        /*--- check if sent ---*/ 
     214        kfree(buf); 
     215        return -ENODATA; 
     216    } 
     217    if(readonce) *readonce = 1; 
     218    sprintf(&buf[len], "-----\n(first) sent on: %s\n", timestart); 
     219    snprintf(crashenv, sizeof(crashenv), "0x%x,0x%x,0x%x;%s", new_sum, new_sram_sum, read_once_cr, timestart); 
     220    TFFS_Write(NULL, FLASH_FS_CRASH, crashenv, strlen(crashenv) + 1, 0); 
     221 
     222    return single_open(file, paniclog_show, buf); 
     223} 
     224/*--------------------------------------------------------------------------------*\ 
     225 * read once crashreport 
     226\*--------------------------------------------------------------------------------*/ 
     227static int panicclog_open_cr(struct inode *inode, struct file *file) { 
     228    return __panicclog_proc_open(inode, file, &read_once_cr); 
     229} 
     230/*--------------------------------------------------------------------------------*\ 
     231 * supportdata  
     232 * read every time possible 
     233\*--------------------------------------------------------------------------------*/ 
     234static int panicclog_open_sd(struct inode *inode, struct file *file) { 
     235    return __panicclog_proc_open(inode, file, NULL); 
     236} 
     237/*--------------------------------------------------------------------------------*\ 
     238 * for crashreport 
     239\*--------------------------------------------------------------------------------*/ 
     240static const struct file_operations paniclog_fops_cr = { 
     241#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32) 
     242   .owner   = THIS_MODULE, 
     243#endif 
     244   .open    = panicclog_open_cr, 
     245   .read    = seq_read, 
     246   .llseek  = seq_lseek, 
     247   .release = seq_release_private,  /*--- gibt txtbuf frei ---*/ 
     248}; 
     249/*--------------------------------------------------------------------------------*\ 
     250 * for supportdata  
     251\*--------------------------------------------------------------------------------*/ 
     252static const struct file_operations paniclog_fops_sd = { 
     253#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32) 
     254   .owner   = THIS_MODULE, 
     255#endif 
     256   .open    = panicclog_open_sd, 
     257   .read    = seq_read, 
     258   .llseek  = seq_lseek, 
     259   .release = seq_release_private,      /*--- gibt txtbuf frei ---*/ 
     260}; 
     261/*--------------------------------------------------------------------------------*\ 
     262\*--------------------------------------------------------------------------------*/ 
     263static int __init panic_prepare_log_proc(void) { 
     264    proc_create("avm_panic_cr", 0, NULL, &paniclog_fops_cr); 
     265    proc_create("avm_panic_sd", 0, NULL, &paniclog_fops_sd); 
     266    return 0; 
     267} 
     268late_initcall(panic_prepare_log_proc); 
     269#endif/*--- #if defined(CONFIG_PROC_FS) ---*/ 
  • .6.32/drivers/char/tffs-2.0/tffs_read.c

    diff -burN 7362_linux-2.6.32/drivers/char/tffs-2.0/tffs_read.c 7320_linux-2.6.32/drivers/char/tffs-2.0/tffs_read.c
    old new  
    6262    } 
    6363 
    6464    if(open_data->stream.avail_in == 0) { 
    65         DBG((KERN_INFO "tff_read: input streem empty, return 0 bytes\n")); 
     65        DBG((KERN_INFO "tff_read: input stream empty, return 0 bytes\n")); 
    6666        vfree(local_read_buffer); 
    6767        return 0; 
    6868    } 
     
    8888            /*--- kein break ---*/ 
    8989        case Z_OK: 
    9090            copy_count = max_read_length - open_data->stream.avail_out; 
     91            if(open_data->kernel_context) { 
     92                /*--- read-access in kernel-context (for panic-log read) ---*/ 
     93                memcpy(read_buffer, local_read_buffer, copy_count); 
     94                *offp += open_data->stream.total_out; 
     95                DBG((KERN_INFO "%s: tffs_read (kernel): status %d read %u bytes\n", MODULE_NAME, status, copy_count)); 
     96                vfree(local_read_buffer); 
     97                return (int)copy_count; 
     98            } 
    9199            if(!copy_to_user(read_buffer, local_read_buffer, copy_count)) { 
    92100                *offp += open_data->stream.total_out; 
    93101                DBG((KERN_INFO "%s: tffs_read: status %d read %u bytes\n", MODULE_NAME, status, copy_count)); 
  • .6.32/drivers/net/avm_cpmac/switch/ifx/7port/swi_7port.c

    diff -burN 7362_linux-2.6.32/drivers/net/avm_cpmac/switch/ifx/7port/swi_7port.c 7320_linux-2.6.32/drivers/net/avm_cpmac/switch/ifx/7port/swi_7port.c
    old new  
    7272static int read_rmon_all_open(struct inode *inode, struct file *file); 
    7373static int mac_table_show(struct seq_file *seq, void *data); 
    7474static int mac_table_open(struct inode *inode, struct file *file); 
     75static ssize_t proc_mac_table_write(struct file *filp, const char __user *buff, size_t len, loff_t *offset); 
    7576 
    7677static int proc_mirror_show(struct seq_file *seq, void *data); 
    7778static int proc_mirror_open(struct inode *inode, struct file *file); 
     
    8586#endif 
    8687   .open    = mac_table_open, 
    8788   .read    = seq_read, 
     89   .write   = proc_mac_table_write, 
    8890   .llseek  = seq_lseek, 
    8991   .release = seq_release, 
    9092}; 
     
    679681            } 
    680682        } 
    681683 
    682         AVMNET_INFOTRC("[%s] setup learning limit = 0 for CPU-Port \n", __func__); 
     684        AVMNET_INFOTRC("[%s] setup learning limit = 0 for CPU-Port and virtual (DSL) Ports \n", __func__); 
     685        for (i = 6; i < 12; i++){ 
    683686        ifx_ethsw_ll_DirectAccessWrite(NULL, 
    684                                        (VR9_PCE_PCTRL_1_LRNLIM_OFFSET + (0xA * 6)), 
     687                                       (VR9_PCE_PCTRL_1_LRNLIM_OFFSET + (0xA * i)), 
    685688                                        VR9_PCE_PCTRL_1_LRNLIM_SHIFT, 
    686689                                        VR9_PCE_PCTRL_1_LRNLIM_SIZE, 0); 
     690        } 
    687691 
    688692        AVMNET_INFOTRC("[%s] Configuring CPU-port to receive all unknown unicast frames \n", __func__); 
    689693        /*--- unicast ---*/ 
     
    13031307 
    13041308/*------------------------------------------------------------------------------------------*\ 
    13051309\*------------------------------------------------------------------------------------------*/ 
     1310static ssize_t proc_mac_table_write(struct file *filp, const char __user *buff, 
     1311                                    size_t len, loff_t *offset __attribute__ ((unused)) ) 
     1312{ 
     1313    char mybuff[128]; 
     1314    struct seq_file *seq; 
     1315    avmnet_module_t *this; 
     1316    int mac, reg, value; 
     1317    int status; 
     1318    struct avmnet_swi_7port_context *ctx; 
     1319 
     1320    if(len >= 128){ 
     1321        return -ENOMEM; 
     1322    } 
     1323 
     1324    seq = (struct seq_file *) filp->private_data; 
     1325    this = (avmnet_module_t *) seq->private; 
     1326    ctx = (struct avmnet_swi_7port_context *) this->priv; 
     1327 
     1328    copy_from_user(&mybuff[0], buff, len); 
     1329    mybuff[len] = 0; 
     1330 
     1331    status = len; 
     1332 
     1333    if(sscanf(mybuff, "read_pctrl %i", &mac) == 1){ 
     1334 
     1335        if (mac < 0 || mac > 11 ){ 
     1336            status = -EINVAL; 
     1337        } else { 
     1338            unsigned int i; 
     1339            for (i = 0; i < 3; i++){ 
     1340                ifx_ethsw_ll_DirectAccessRead(NULL, (0x480 + i + (0xA * mac)), 0, 16, &value); 
     1341                printk(KERN_ERR "[mac=%d reg=%d] = %#x\n", mac, i, value); 
     1342            } 
     1343        } 
     1344 
     1345    } 
     1346    else if(sscanf(mybuff, "write_pctrl %i %i %i", &mac, &reg, &value) == 3){ 
     1347 
     1348        if ( ( mac < 0 ) || ( mac > 11 ) || (reg < 0 ) || (reg > 2)){ 
     1349            status = -EINVAL; 
     1350        } else { 
     1351            ifx_ethsw_ll_DirectAccessWrite(NULL, (0x480 + reg + (0xA * mac)), 0, 16, value); 
     1352            printk(KERN_ERR "[write_ctl mac=%d, reg=%d] = %#x\n", mac, reg, value); 
     1353        } 
     1354 
     1355    } 
     1356    else if(strncmp(mybuff, "reset_table", 11 ) == 0) { 
     1357        avmnet_swi_7port_disable_learning(avmnet_hw_config_entry->config); 
     1358 
     1359    } 
     1360    else if(strncmp(mybuff, "flush_table", 11 ) == 0) { 
     1361        ifx_ethsw_ll_DirectAccessWrite(NULL, 
     1362                                       VR9_PCE_GCTRL_0_MTFL_OFFSET, 
     1363                                       VR9_PCE_GCTRL_0_MTFL_SHIFT, 
     1364                                       VR9_PCE_GCTRL_0_MTFL_SIZE, 
     1365                                       1); 
     1366    } 
     1367    else if(strncmp(mybuff, "setup_non_ethernet", 18) == 0) { 
     1368        setup_non_ethernet_deault_port(); 
     1369 
     1370    } else { 
     1371        status = -EINVAL; 
     1372    } 
     1373 
     1374    if(status == -EINVAL){ 
     1375        printk(KERN_ERR "[%s] Usage:\n", __func__); 
     1376        printk(KERN_ERR "[%s]     read_pctrl <mac> \n", __func__); 
     1377        printk(KERN_ERR "[%s]     write_pctrl <mac> <reg> <value>\n", __func__); 
     1378        printk(KERN_ERR "[%s]     flush_table \n", __func__); 
     1379        printk(KERN_ERR "[%s]     setup_non_ethernet \n", __func__); 
     1380        printk(KERN_ERR "[%s]     reset_table \n", __func__); 
     1381    } 
     1382 
     1383    return status; 
     1384} 
     1385 
     1386 
    13061387 
    13071388static int mac_table_show(struct seq_file *seq, void *data __attribute__ ((unused)) ) 
    13081389{ 
  • .6.32/drivers/net/avm_cpmac/switch/ifx/ar10/ifxmips_ppa_datapath_ar10_a5.c

    diff -burN 7362_linux-2.6.32/drivers/net/avm_cpmac/switch/ifx/ar10/ifxmips_ppa_datapath_ar10_a5.c 7320_linux-2.6.32/drivers/net/avm_cpmac/switch/ifx/ar10/ifxmips_ppa_datapath_ar10_a5.c
    old new  
    565565#define AR10_CGU_CLKFSR                          ((volatile u32*)(AR10_CGU + 0x0010)) 
    566566 
    567567/* 
     568  * Chip ID Registers 
     569*/ 
     570#define AR10_MIPS_CHIPID_BASE                   (KSEG1 | 0x1F107340) 
     571#define AR10_MIPS_CHIPID                        (volatile u32*)(AR10_MIPS_CHIPID_BASE + 0x4) 
     572 
     573/* 
    568574 * #################################### 
    569575 *              Data Type 
    570576 * #################################### 
     
    579585} ppe_u64_t; 
    580586 
    581587/* 
     588 *CHIP ID 
     589 */ 
     590struct ar10_chipid{ 
     591    unsigned int   res0     :1; 
     592    unsigned int   version  :3; 
     593    unsigned int   pnum     :16; 
     594    unsigned int   manid    :11; 
     595    unsigned int   res1     :1; 
     596}; 
     597 
     598 
     599/* 
    582600 *  PPE ATM Cell Header 
    583601 */ 
    584602#if defined(__BIG_ENDIAN) 
     
    61666184    return len; 
    61676185} 
    61686186 
    6169 #if 0 
     6187#if defined(DEBUG_FIRMWARE_TABLES_PROC) && DEBUG_FIRMWARE_TABLES_PROC 
    61706188static int print_dsl_dma_desc(char *buf, volatile u32 *desc_base, int desc_pos) { 
    61716189    int len = 0; 
    61726190    u32 *p; 
     
    62066224 
    62076225    return len; 
    62086226} 
    6209 #endif 
    62106227 
    6211 #if 0 
    62126228static int proc_read_dsl_tx_dma_descr(IFX_char_t *page, IFX_char_t **start, off_t off __attribute__((unused)), 
    62136229        int count, int *eof, void *data __attribute__((unused))) 
    62146230{ 
     
    1175211768        ops->ndo_do_ioctl = &ifx_ppa_eth_ioctl_a5; 
    1175311769    } 
    1175411770} 
     11771/*------------------------------------------------------------------------------------------*\ 
     11772\*------------------------------------------------------------------------------------------*/ 
     11773static uint32_t get_mailbox1_irq_num(void) 
     11774{ 
     11775    volatile struct ar10_chipid *chipid = (volatile struct ar10_chipid *)AR10_MIPS_CHIPID; 
     11776    printk("CHIPID: %d, chipid address: 0x%x\n", chipid->version, (uint32_t)chipid); 
     11777    if(chipid->version > 1){ 
     11778        return IFX_PPE_MBOX_INT1; //24 
     11779    } 
     11780 
     11781    return IFX_PPE_MBOX_INT2; //29 
     11782} 
     11783 
     11784 
    1175511785 
    1175611786/*------------------------------------------------------------------------------------------*\ 
    1175711787\*------------------------------------------------------------------------------------------*/ 
     
    1187211902 
    1187311903 
    1187411904 
    11875     ret = request_irq(IFX_PPE_MBOX_INT2, mailbox1_irq_handler, IRQF_DISABLED, "a5_mailbox1_isr", NULL); 
     11905    ret = request_irq(get_mailbox1_irq_num(), mailbox1_irq_handler, IRQF_DISABLED, "a5_mailbox1_isr", NULL); 
    1187611906    if (ret) { 
    1187711907        if (ret == -EBUSY) 
    1187811908            err( "IRQ may be occupied by other PPE driver, please reconfig to disable it.\n"); 
     
    1205412084    PP32_START_FAIL:  
    1205512085        free_irq(IFX_PPE_MBOX_INT0, NULL); 
    1205612086    REQUEST_IRQ_FAIL:  
    12057         free_irq(IFX_PPE_MBOX_INT2, NULL); 
     12087        free_irq(get_mailbox1_irq_num(), NULL); 
    1205812088 
    1205912089    REQUEST_IGU0_IRQ_FAIL: 
    1206012090    ATM_DEV_REGISTER_FAIL:  
     
    1215312183    pp32_stop(); 
    1215412184 
    1215512185    free_irq(IFX_PPE_MBOX_INT0 , NULL); 
    12156     free_irq(IFX_PPE_MBOX_INT2 , NULL); 
     12186    free_irq(get_mailbox1_irq_num() , NULL); 
    1215712187 
    1215812188 
    1215912189#if 0 
  • .6.32/drivers/net/avm_cpmac/switch/ifx/ar9/ifxmips_ppa_datapath_ar9_a5.c

    diff -burN 7362_linux-2.6.32/drivers/net/avm_cpmac/switch/ifx/ar9/ifxmips_ppa_datapath_ar9_a5.c 7320_linux-2.6.32/drivers/net/avm_cpmac/switch/ifx/ar9/ifxmips_ppa_datapath_ar9_a5.c
    old new  
    300300 
    301301#else // defined(CONFIG_AVMNET_DEBUG)  
    302302 
    303 #define CONFIG_AVMNET_DEBUG                            0 
    304303 
    305304#define ENABLE_ASSERT                           0 
    306305 
  • .6.32/drivers/net/avm_cpmac/switch/ifx/common/ifx_ppa_mini_sessions.c

    diff -burN 7362_linux-2.6.32/drivers/net/avm_cpmac/switch/ifx/common/ifx_ppa_mini_sessions.c 7320_linux-2.6.32/drivers/net/avm_cpmac/switch/ifx/common/ifx_ppa_mini_sessions.c
    old new  
    727727 
    728728    int aass = 0; //AVM_ADD_SESSION_STATE 
    729729    uint16_t outgoing_vlan_tci[MAX_SUPPORTED_VLAN_TAGS]; 
    730     uint16_t incoming_vlan_tci[MAX_SUPPORTED_VLAN_TAGS]; 
     730    //uint16_t incoming_vlan_tci[MAX_SUPPORTED_VLAN_TAGS]; IFX_PPA doesn't match on incomming VLAN ID 
    731731 
    732732    uint16_t nr_vlan_out = 0; 
    733733    uint16_t nr_vlan_in = 0; 
     
    918918            case AVM_PA_IPV4: 
    919919                aass |= AASS_INGRESS_IPV4; 
    920920                if ( aass & AASS_INGRESS_IPV6 ){ 
     921 
    921922                    // das sollte eigentlich nicht passieren, da erst ipv4 u. danach ipv6 header geparsed wird 
    922923                    session_debug(DBG_ENABLE_MASK_ADD_SESSION_TRACE,"Session seems to be 6RD, put IPv4-addresses into tunnel field\n"); 
    923924                    p_item->tun_saddr.ip = hdr->iph.saddr; 
     
    951952                /* WAN ingress */ 
    952953                p_item->pppoe_session_id = hdr->pppoeh.sid; 
    953954                session_debug(DBG_ENABLE_MASK_ADD_SESSION, "[%s] incoming pppoe_id %d\n", __FUNCTION__, p_item->pppoe_session_id); 
    954                 p_item->flags |= SESSION_VALID_PPPOE; 
    955955                aass |= AASS_INGRESS_PPPOE; 
     956                p_item->flags |= SESSION_VALID_PPPOE; 
    956957                break; 
    957958 
    958959            case AVM_PA_VLAN: 
    959960                session_debug(DBG_ENABLE_MASK_ADD_SESSION_TRACE," got incoming vlan id %d\n", VLAN_ID( &hdr->vlanh )); 
    960961                if ( nr_vlan_in < num_supported_ingerss_vlan_tags ) { 
    961                     incoming_vlan_tci[nr_vlan_in++] = htons(hdr->vlanh.vlan_tci); 
     962                    // incoming_vlan_tci[nr_vlan_in] = htons(hdr->vlanh.vlan_tci); 
     963                    nr_vlan_in++; 
    962964                } else { 
    963965                    session_error("to many incoming vlan tags (>%d) ", num_supported_ingerss_vlan_tags); 
    964966                    goto ERR_FREE_PITEM; 
     
    10741076                session_debug(DBG_ENABLE_MASK_ADD_SESSION_TRACE,"egress PPPOE\n" ); 
    10751077                { 
    10761078                    struct pppoehdr *pppoe_hdr = (struct pppoehdr *)(avm_session->egress[0].match.hdrcopy +avm_session->egress[0].match.hdroff + avm_session->egress[0].pppoe_offset); 
    1077                     p_item->pppoe_session_id = pppoe_hdr->sid; 
    1078                     session_debug(DBG_ENABLE_MASK_ADD_SESSION, "[%s] outgoing pppoe_id %d\n", __FUNCTION__, p_item->pppoe_session_id); 
    1079                     p_item->flags |= SESSION_VALID_PPPOE; 
     1079                    u16 outgoing_pppoe_sid = pppoe_hdr->sid; 
     1080 
    10801081                    aass |= AASS_EGRESS_PPPOE; 
     1082                    session_debug( DBG_ENABLE_MASK_ADD_SESSION, "[%s] outgoing pppoe_id %d\n", __FUNCTION__, outgoing_pppoe_sid ); 
     1083 
     1084                    if (( aass & AASS_INGRESS_PPPOE ) && (outgoing_pppoe_sid == p_item->pppoe_session_id)){ 
     1085                        // PPPOE NQOS-PATH-THROUGH ppa shall not add additional pppoe header 
     1086                        session_debug( DBG_ENABLE_MASK_ADD_SESSION, "[%s] outgoing and incoming pppoe_sid are equivalent -> Box seems to be trunk port mode\n", __FUNCTION__, outgoing_pppoe_sid ); 
     1087                        p_item->flags &= ~SESSION_VALID_PPPOE; 
     1088                    } else { 
     1089 
     1090                        p_item->pppoe_session_id = outgoing_pppoe_sid; 
     1091                        p_item->flags |= SESSION_VALID_PPPOE; 
     1092                    } 
    10811093                } 
    10821094                break; 
    10831095 
  • .6.32/drivers/serial/serial_avm_8250.c

    diff -burN 7362_linux-2.6.32/drivers/serial/serial_avm_8250.c 7320_linux-2.6.32/drivers/serial/serial_avm_8250.c
    old new  
    190190ignore_char: 
    191191        lsr = base_8250->lsr;  
    192192    } 
    193     spin_unlock(&port->lock); 
    194193    tty_flip_buffer_push(tty); 
    195     spin_lock(&port->lock); 
    196194    *lsrp = lsr; 
    197195} 
    198196/*------------------------------------------------------------------------------------------*\ 
     
    239237    struct uart_port *port = dev_id; 
    240238    struct avm_serial_priv *port_priv_data = port->private_data; 
    241239    struct avm_8250_regs *base_8250 = ((struct _port8250_priv *)(port_priv_data->port_specificdata))->regs; 
    242     unsigned int handled = 0; 
     240    enum irqreturn handled = IRQ_NONE; 
    243241    unsigned int iir; 
    244242 
    245243    iir = base_8250->iir_fcr; 
     
    251249 
    252250        if ( port_priv_data->rx_enabled && (lsr & (UART_LSR_DR | UART_LSR_BI))){ 
    253251            uart_avm_8250_rx_chars(port, &lsr); 
    254             handled = 1; 
     252            handled = IRQ_HANDLED; 
    255253        } 
    256254        if ( port_priv_data->tx_enabled && (lsr & UART_LSR_THRE)) {  
    257255            /* tx_fifo komplett leer */ 
    258256            uart_avm_8250_tx_chars(port); 
    259             handled = 1; 
     257            handled = IRQ_HANDLED; 
    260258        } 
    261259    } 
    262260    return IRQ_RETVAL(handled); 
  • .6.32/drivers/serial/serial_avm_ath_hi.c

    diff -burN 7362_linux-2.6.32/drivers/serial/serial_avm_ath_hi.c 7320_linux-2.6.32/drivers/serial/serial_avm_ath_hi.c
    old new  
    160160 
    161161 
    162162            uart_insert_char(port, 0, 0, ch, flag); 
    163             spin_unlock(&port->lock); 
    164163            tty_flip_buffer_push(tty); 
    165             spin_lock(&port->lock); 
    166164        } 
    167165 
    168166ignore_char: 
     
    238236    struct uart_port *port = dev_id; 
    239237    struct avm_serial_priv *port_priv_data = port->private_data; 
    240238    struct avm_ath_hi_regs *base_ath_hi = ((struct _portath_hi_priv *)(port_priv_data->port_specificdata))->regs; 
    241     unsigned int handled = 0; 
    242239    union avm_ath_hi_regs_irq_status status = base_ath_hi->status; 
    243240    /*--- union avm_ath_hi_regs_config config; ---*/ 
    244241 
     
    360357            printk(KERN_ERR "[%s] unhandle irq 0x%x\n", __FUNCTION__, status.Register); 
    361358 
    362359        status = base_ath_hi->status; 
    363         handled = 1; 
    364360        /*--- printk(KERN_ERR "[%s] uart (end) config 0x%x\n", __FUNCTION__, base_ath_hi->config.Register); ---*/ 
    365361    } 
    366362 
    367     /*--- printk(KERN_ERR "[%s] handled %d \n", __FUNCTION__, handled); ---*/ 
    368         handled = 1; 
    369     return IRQ_RETVAL(handled); 
     363    return IRQ_RETVAL(IRQ_HANDLED); 
    370364} 
    371365/*--------------------------------------------------------------------------------*\ 
    372366\*--------------------------------------------------------------------------------*/ 
     
    376370    unsigned long flags; 
    377371    unsigned int status; 
    378372    /*--- printk(KERN_ERR "[%s] \n", __FUNCTION__); ---*/ 
    379     spin_lock_irqsave(port->lock, flags); 
     373    spin_lock_irqsave(&port->lock, flags); 
    380374    /*--- if(base_ath_hi->status.Bits.tx_empty || base_ath_hi->status.Bits.tx_ready_int) { ---*/ 
    381375    if(base_ath_hi->status.Bits.tx_empty) { 
    382376        status = 1; 
    383377    } 
    384     spin_unlock_irqrestore(port->lock, flags); 
     378    spin_unlock_irqrestore(&port->lock, flags); 
    385379    return status; 
    386380} 
    387381 
     
    420414    int baudClockFreq = port_priv_data->baudval; 
    421415    int serialClockFreq = uart_avm_ath_hi_get_serial_clock(); 
    422416 
    423     printk(KERN_ERR "[%s/%d] set baudrate to '%d' baud clock '%d' serial clock '%d'\n", __FUNCTION__, __LINE__, port_priv_data->baudval, baudClockFreq, serialClockFreq ); 
     417    printk(KERN_INFO "[%s/%d] set baudrate to '%d' baud clock '%d' serial clock '%d'\n", __FUNCTION__, __LINE__, port_priv_data->baudval, baudClockFreq, serialClockFreq ); 
    424418    base_ath_hi->clock.Bits.clock_scale = ((serialClockFreq >> 17) * 1310) / baudClockFreq; 
    425419    base_ath_hi->clock.Bits.clock_step = ((128 * (baudClockFreq / 100) * (base_ath_hi->clock.Bits.clock_scale + 1)) << 10) / (serialClockFreq / 100); 
    426420    /*--- printk(KERN_ERR "[%s/%d] scale %d step %d\n", __FUNCTION__, __LINE__, base_ath_hi->clock.Bits.clock_scale, base_ath_hi->clock.Bits.clock_step); ---*/ 
  • .6.32/drivers/usb/musb/ifxhcd.c

    diff -burN 7362_linux-2.6.32/drivers/usb/musb/ifxhcd.c 7320_linux-2.6.32/drivers/usb/musb/ifxhcd.c
    old new  
    14201420    } 
    14211421 
    14221422    ifxhc->do_ping=0; 
     1423    /* 20131126 AVM/WK - FIX: never start new URB with PING, some USB devices don't like it. */  
     1424#if 0 
    14231425    if (_ifxhcd->core_if.snpsid < 0x4f54271a && ifxhc->speed == IFXUSB_EP_SPEED_HIGH) 
    14241426        ifxhc->do_ping=1; 
     1427#endif 
    14251428 
    14261429 
    14271430    /* Set the split attributes */ 
     
    20402043 
    20412044    _ifxhc->nak_countdown=_ifxhc->nak_countdown_r; 
    20422045 
    2043     /* AVM/BC 20101111 Workaround: Always PING if HI-Speed Out and xfer_len > 0 */ 
    2044     if(/*_ifxhc->do_ping &&*/ 
     2046/* AVM/WK 20131126 Fix: Only start PING if necessary 
     2047    (if do_ping is set (after NAK/NYET), mostly on AR9) 
     2048    VR9 and AR10 should handle automatically  
     2049*/ 
     2050 
     2051    if(_ifxhc->do_ping && 
    20452052        (!_ifxhc->is_in) && 
    20462053        (_ifxhc->speed == IFXUSB_EP_SPEED_HIGH) && 
    20472054        ((_ifxhc->ep_type == IFXUSB_EP_TYPE_BULK) || ((_ifxhc->ep_type == IFXUSB_EP_TYPE_CTRL) && (_ifxhc->control_phase != IFXHCD_CONTROL_SETUP))) && 
  • .6.32/drivers/usb/musb/ifxhcd_intr.c

    diff -burN 7362_linux-2.6.32/drivers/usb/musb/ifxhcd_intr.c 7320_linux-2.6.32/drivers/usb/musb/ifxhcd_intr.c
    old new  
    2929#error AVM/WK: CONFIG_USB_HOST_IFX_WITH_ISO currently not supported! 
    3030#endif 
    3131 
     32#define MAX_ERROR_CNT 15 
     33 
    3234/* Macro used to clear one channel interrupt */ 
    3335#define clear_hc_int(_hc_regs_,_intr_) \ 
    3436    do { \ 
     
    754756                _urbd->error_count++; 
    755757            } 
    756758 
    757             if (_urbd->error_count >= 3) 
     759            if (_urbd->error_count >= MAX_ERROR_CNT) 
    758760            { 
    759761                _urbd->error_count     =0; 
    760762                _ifxhc->wait_for_sof   =0; 
     
    967969            else 
    968970            { 
    969971                _urbd->error_count ++ ; 
    970                 if (_urbd->error_count == 3) 
     972                if (_urbd->error_count >= MAX_ERROR_CNT) 
    971973                { 
    972974                    disable_hc_int(_hc_regs,ack); 
    973975                    disable_hc_int(_hc_regs,nak); 
     
    12191221                _urbd->error_count++; 
    12201222            } 
    12211223 
    1222             if(_urbd->error_count>=3) 
     1224            if(_urbd->error_count >= MAX_ERROR_CNT) 
    12231225            { 
    12241226                _urbd->error_count     =0; 
    12251227                _ifxhc->wait_for_sof   =0; 
     
    13941396                _urbd->error_count++; 
    13951397            } 
    13961398 
    1397             if(_urbd->error_count>=3) 
     1399            if(_urbd->error_count >= MAX_ERROR_CNT) 
    13981400            { 
    13991401                _urbd->error_count     =0; 
    14001402                _ifxhc->wait_for_sof   =0; 
     
    14871489                    _ifxhc->xfer_count         = _urbd->urb->actual_length; 
    14881490                    _ifxhc->data_pid_start = read_data_toggle(_hc_regs); 
    14891491                    _urbd->error_count++; 
    1490                     if(_urbd->error_count>=3) 
     1492                    if(_urbd->error_count >= MAX_ERROR_CNT) 
    14911493                    { 
    14921494                        _urbd->error_count=0; 
    14931495                        _ifxhc->wait_for_sof   = 0; 
     
    15821584                    _ifxhc->xfer_count         = _urbd->urb->actual_length; 
    15831585                    _ifxhc->data_pid_start = read_data_toggle(_hc_regs); 
    15841586                    _urbd->error_count++; 
    1585                     if(_urbd->error_count>=3) 
     1587                    if(_urbd->error_count >= MAX_ERROR_CNT) 
    15861588                    { 
    15871589                        _urbd->error_count=0; 
    15881590                        _ifxhc->wait_for_sof   = 0; 
     
    16071609                return 1; 
    16081610            } 
    16091611            _urbd->error_count++; 
    1610             if(_urbd->error_count>=3) 
     1612            if(_urbd->error_count >= MAX_ERROR_CNT) 
    16111613            { 
    16121614                _urbd->error_count=0; 
    16131615                _ifxhc->wait_for_sof   = 0; 
     
    16691671    else if (hcint.b.xacterr) 
    16701672    { 
    16711673        _urbd->error_count++; 
    1672         if(_urbd->error_count>=3) 
     1674        if(_urbd->error_count >= MAX_ERROR_CNT) 
    16731675        { 
    16741676            _urbd->error_count=0; 
    16751677            _ifxhc->wait_for_sof =0; 
     
    18091811    else if(hcint.b.xacterr    ) 
    18101812    { 
    18111813        _urbd->error_count++; 
    1812         if(_urbd->error_count>=3) 
     1814        if(_urbd->error_count >= MAX_ERROR_CNT) 
    18131815        { 
    18141816            _urbd->error_count=0; 
    18151817            _ifxhc->wait_for_sof  =0; 
     
    19101912        hcchar_data_t   hcchar; 
    19111913        hcchar.d32 = ifxusb_rreg(&_hc_regs->hcchar); 
    19121914        _urbd->error_count=hcchar.b.multicnt; 
    1913         if(_urbd->error_count>=3) 
     1915        if(_urbd->error_count >= MAX_ERROR_CNT) 
    19141916        { 
    19151917            _urbd->error_count=0; 
    19161918            _ifxhc->wait_for_sof   = 0; 
     
    20292031        hcchar_data_t   hcchar; 
    20302032        hcchar.d32 = ifxusb_rreg(&_hc_regs->hcchar); 
    20312033        _urbd->error_count=hcchar.b.multicnt; 
    2032         if(_urbd->error_count>=3) 
     2034        if(_urbd->error_count >= MAX_ERROR_CNT) 
    20332035        { 
    20342036            _urbd->error_count=0; 
    20352037            _ifxhc->wait_for_sof =0; 
     
    22532255    else if(hcint.b.xacterr    ) 
    22542256    { 
    22552257        _urbd->error_count++; 
    2256         if(_urbd->error_count>=3) 
     2258        if(_urbd->error_count >= MAX_ERROR_CNT) 
    22572259        { 
    22582260            _urbd->error_count=0; 
    22592261            _ifxhc->wait_for_sof   = 0; 
     
    23982400    else if(hcint.b.xacterr    ) 
    23992401    { 
    24002402        _urbd->error_count++; 
    2401         if(_urbd->error_count>=3) 
     2403        if(_urbd->error_count >= MAX_ERROR_CNT) 
    24022404        { 
    24032405            _urbd->error_count=0; 
    24042406            _ifxhc->wait_for_sof   = 0; 
     
    25262528        hcchar_data_t   hcchar; 
    25272529        hcchar.d32 = ifxusb_rreg(&_hc_regs->hcchar); 
    25282530        _urbd->error_count=hcchar.b.multicnt; 
    2529         if(_urbd->error_count>=3) 
     2531        if(_urbd->error_count >= MAX_ERROR_CNT) 
    25302532        { 
    25312533            _urbd->error_count=0; 
    25322534            _ifxhc->wait_for_sof   = 0; 
     
    26382640        hcchar_data_t   hcchar; 
    26392641        hcchar.d32 = ifxusb_rreg(&_hc_regs->hcchar); 
    26402642        _urbd->error_count=hcchar.b.multicnt; 
    2641         if(_urbd->error_count>=3) 
     2643        if(_urbd->error_count >= MAX_ERROR_CNT) 
    26422644        { 
    26432645            _urbd->error_count=0; 
    26442646            _ifxhc->wait_for_sof   = 0; 
  • .6.32/fusiv_src/kernel/ap_code/lib/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/ap_code/lib/Makefile 7320_linux-2.6.32/fusiv_src/kernel/ap_code/lib/Makefile
    old new  
    1 # 
    2 #/* Copyright (C) 2006 Ikanos Communications 
    3 # * See IKANOS_PROP_LICENSE.txt for license information. */ 
    4 # 
    5  
    6 FUSIVLIB_OBJ := initlib.o syscalls.o buftrans.o atmupstfpath.o \ 
    7                 netpro/apload.o netpro/appmem.o netpro/apdmem.o \ 
    8                 netpro/hostconfig.o netpro/hostbridge.o \ 
    9                 netpro/hostapipc.o netpro/hostqos.o netpro/hostroute.o netpro/hostap.o \ 
    10                 netpro/ipv6_api.o netpro/hostroute_syms.o \ 
    11                 gpiolib/gpioapi.o gpiolib/ipc_syms.o gpiolib/gpioisr.o gpiolib/gpio_adi6843.o \ 
    12         ../buffmanager/bmmain_syms.o netpro/ipcqos.o 
    13  
    14 ifeq ($(CONFIG_FUSIV_VX180),y) 
    15 FUSIVLIB_OBJ += ../buffmanager/bmmain_vx180.o  mips24ke_cache.o vx180_cache.o  
    16 else 
    17 FUSIVLIB_OBJ += ../buffmanager/bmmain.o 
    18 endif 
    19  
    20 obj-$(CONFIG_FUSIV_LIBRARY) := fusivlib_lkm.o 
    21 fusivlib_lkm-objs := $(FUSIVLIB_OBJ) 
    22  
    23 clean: 
    24     rm -f *.ko *.o *.mod.o */*.o *~ */*~ core .depend .*.cmd *.mod.c */.*.o.cmd 
    25     rm -rf .tmp_versions 
    26     rm -rf  syscalls.o buftrans.o atmupstfpath.o \ 
    27                 netpro/apload.o netpro/appmem.o netpro/apdmem.o \ 
    28                 netpro/hostconfig.o netpro/hostbridge.o \ 
    29                 netpro/hostapipc.o netpro/hostqos.o netpro/hostroute.o netpro/hostap.o \ 
    30                 netpro/ipv6_api.o netpro/hostroute_syms.o \ 
    31                 gpiolib/gpioapi.o gpiolib/ipc_syms.o gpiolib/gpioisr.o gpiolib/gpio_adi6843.o \ 
    32                 ../buffmanager/bmmain.o 
  • .6.32/fusiv_src/kernel/ap_code/vdsl_ptm/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/ap_code/vdsl_ptm/Makefile 7320_linux-2.6.32/fusiv_src/kernel/ap_code/vdsl_ptm/Makefile
    old new  
    1 # ============================================================================= 
    2 # 
    3 # Copyright (C) 2001 Analog Devices Inc. All rights reserved 
    4 # 
    5 # The information and source code contained herein is the exclusive property 
    6 # of Analog Devices and may not be disclosed, examined or reproduced in whole 
    7 # or in part without the explicit written authorization from Analog Devices. 
    8 # 
    9 # ===========================================================================*/ 
    10  
    11 # ============================================================================= 
    12 # 
    13 # File name    : $RCSfile: Makefile,v $ 
    14 # Author       : $Author: vreddy $ 
    15 # Version      : $Revision: 1.1 $ # Description  : Makefile for the 'C' EMAC driver 
    16 # 
    17 # ===========================================================================*/ 
    18  
    19 # Get the build configuration information. This includes the target 
    20 # to build 
    21  
    22 LIB =   vdslptm.a 
    23  
    24 OBJS =  apptmload.o  vdslptmmain.o \ 
    25         fusiv_decoder.o fusiv_encoder.o fusiv_rx_slb.o fusiv_tx_slb.o \ 
    26     vdslptm.o vdslptmdriver.o 
    27  
    28 APAS = ../tools/ap_asm/apas 
    29  
    30 AFLAGS = -DASSEMBLER -MMD -I../inc/netpro -DVDSLAP 
    31  
    32 PREINC = -I phy -I ptmap -I ptminclude 
    33  
    34 %.o:    ptmap/%.c 
    35     $(CC) -c $(PREINC) $(NCOPTS) $(EXTRA) $(INCS) -I. -o $@ $< 
    36  
    37 %.o:    phy/%.c 
    38     $(CC) -c $(PREINC) $(NCOPTS) $(EXTRA) $(INCS) -I. -o $@ $< 
    39  
    40 %.o:    driver/%.c 
    41     $(CC) -c $(PREINC) $(NCOPTS) $(EXTRA) $(INCS) -I. -o $@ $< 
    42  
    43 include ../sys/config.mk 
    44  
    45 .PHONY: ptmap/vdslptmmain.c 
    46 ptmap/vdslptmmain.c: 
    47     @( if [ -d ptmap/apcode ] ; then cd ptmap/apcode && $(MAKE) vdslptmmain.c ; fi ) 
    48  
    49 clean: 
    50     $(RM) *.d *.o *.a ptmap/apcode/vdslptmmain.c 
  • .6.32/fusiv_src/kernel/drivers/acl_ap/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/acl_ap/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/acl_ap/Makefile
    old new  
    1  
    2  # ============================================================================= 
    3  # 
    4  # Copyright (C) 2005 Analog Devices Inc. All rights reserved 
    5  # 
    6  # The information and source code contained herein is the exclusive property 
    7  # of Analog Devices and may not be disclosed, examined or reproduced in whole 
    8  # or in part without the explicit written authorization from Analog Devices. 
    9  # 
    10  # =========================================================================== 
    11  
    12 ACLAPDRIVER_OBJ :=             acl_ap_driver.o aclapi.o aclRFTcheck.o  aclBFTcheck.o \ 
    13                 ../../ap_code/acl_ap/apaclload.o 
    14 ifeq ($(CONFIG_FUSIV_VX180),y) 
    15 ACLAPDRIVER_OBJ += ../../ap_code/acl_ap/aclapmain_vx180.o 
    16 else 
    17 ACLAPDRIVER_OBJ += ../../ap_code/acl_ap/aclapmain.o 
    18 endif 
    19  
    20 obj-$(CONFIG_FUSIV_LIBRARY) := aclap_driver_lkm.o 
    21 aclap_driver_lkm-objs := $(ACLAPDRIVER_OBJ) 
    22  
    23 clean: 
    24     rm -f *.ko *.o *.mod.o */*.o *~ */*~ core .depend .*.cmd *.mod.c */.*.o.cmd 
    25     rm -rf .tmp_versions \ 
    26     rm ../../ap_code/acl_ap/apaclload.o \ 
    27     rm ../../ap_code/acl_ap/aclapmain.o 
    28     rm ../../ap_code/acl_ap/aclapmain_vx180.o 
  • .6.32/fusiv_src/kernel/drivers/ap2ap/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/ap2ap/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/ap2ap/Makefile
    old new  
    1 # 
    2 #/* Copyright (C) 2006 Ikanos Communications 
    3 # * See IKANOS_PROP_LICENSE.txt for license information. */ 
    4 # 
    5  
    6 AP2AP_OBJ :=    ap2aproute.o ap2apbridge.o ap2apmulticast.o ap2apmulticastrt.o 
    7  
    8 obj-$(CONFIG_FUSIV_KERNEL_AP_2_AP) := ap2ap_lkm.o 
    9 ap2ap_lkm-objs := $(AP2AP_OBJ) 
    10  
    11 clean: 
    12     rm -f *.ko *.o *.mod.o */*.o *~ */*~ core .depend .*.cmd *.mod.c */.*.o.cmd 
    13     rm -rf .tmp_versions 
    14  
  • .6.32/fusiv_src/kernel/drivers/atm/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/atm/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/atm/Makefile
    old new  
    1 # 
    2 #/* Copyright (C) 2006 Ikanos Communications 
    3 # * See IKANOS_PROP_LICENSE.txt for license information. */ 
    4 # 
    5  
    6 ATMDRIVER_OBJ :=        mini_at200_drv.o atmapdriver.o \ 
    7                         ../adsl/idma/adi_adsl_phy.o \ 
    8                         ../adsl/idma/adi_adsl_swap.o \ 
    9                         ../adsl/idma/idmaboot.o \ 
    10                         ../adsl/idma/rwfunc.o \ 
    11                         ../adsl/idma/adi_asm.o \ 
    12                         ../adsl/mgmt/atmconf.o \ 
    13                         ../adsl/mgmt/atmmib.o \ 
    14                         ../adsl/mgmt/atmlib.o \ 
    15                         ../adsl/mgmt/adslconfig.o \ 
    16                         ../adsl/mgmt/adsllib.o \ 
    17                         ../adsl/mgmt/cmvrw.o \ 
    18                         ../adsl/mgmt/snmp_syms.o \ 
    19                         ../adsl/mgmt/adsl2reg.o \ 
    20                         ../adsl/mgmt/adslutils.o \ 
    21                         ../adsl/mgmt/cmvutils.o \ 
    22                         ../../ap_code/atm/atmapload.o \ 
    23                         ../../ap_code/atm/utpconfig.o \ 
    24                         ../../ap_code/atm/atmhost.o \ 
    25                         ../../ap_code/atm/oamresponse.o \ 
    26                         ../../ap_code/atm/crc10.o \ 
    27                         ../../ap_code/atm/plane.o \ 
    28                         ../../ap_code/atm/atmapi.o \ 
    29                         ../../ap_code/atm/atm_misc.o \ 
    30                         ../../ap_code/user_config/atm/atmapif.o 
    31  
    32 ifeq ($(CONFIG_FUSIV_VX180),y) 
    33 ifeq ($(CONFIG_FUSIV_KERNEL_VX180_AVDSL),m) 
    34 ATMDRIVER_OBJ +=        ../../ap_code/atm/atmmain_adsl_180a.o 
    35 ATMDRIVER_OBJ +=        ../../ap_code/vdsl_ptm/driver/vdslptmdriver.o 
    36 ATMDRIVER_OBJ +=        ../../ap_code/vdsl_ptm/driver/vdslptm.o 
    37 ATMDRIVER_OBJ +=        ../../ap_code/vdsl_ptm/phy/fusiv_decoder.o 
    38 ATMDRIVER_OBJ +=        ../../ap_code/vdsl_ptm/phy/fusiv_encoder.o 
    39 ATMDRIVER_OBJ +=        ../../ap_code/vdsl_ptm/phy/fusiv_rx_slb.o 
    40 ATMDRIVER_OBJ +=        ../../ap_code/vdsl_ptm/phy/fusiv_tx_slb.o 
    41 ATMDRIVER_OBJ +=        ../../ap_code/user_config/vdsl_ptm/vdslptmif.o 
    42 else 
    43 ATMDRIVER_OBJ +=        ../../ap_code/atm/atmmain_180a.o 
    44 endif 
    45 else 
    46 ATMDRIVER_OBJ +=        ../../ap_code/atm/atmmain.o 
    47 endif 
    48  
    49 obj-$(CONFIG_FUSIV_KERNEL_ATM) := atmdriver_lkm.o 
    50 atmdriver_lkm-objs := $(ATMDRIVER_OBJ) 
    51  
    52 clean: 
    53     rm -f *.ko *.o *.mod.o */*.o *~ */*~ core .depend .*.cmd *.mod.c */.*.o.cmd 
    54     rm -rf .tmp_versions 
    55     rm ../adsl/idma/adi_adsl_phy.o \ 
    56                         ../adsl/idma/adi_adsl_swap.o \ 
    57                         ../adsl/idma/idmaboot.o \ 
    58                         ../adsl/idma/rwfunc.o \ 
    59                         ../adsl/idma/adi_asm.o \ 
    60                         ../adsl/mgmt/atmconf.o \ 
    61                         ../adsl/mgmt/atmmib.o \ 
    62                         ../adsl/mgmt/atmlib.o \ 
    63                         ../adsl/mgmt/adslconfig.o \ 
    64                         ../adsl/mgmt/adsllib.o \ 
    65                         ../adsl/mgmt/cmvrw.o \ 
    66                         ../adsl/mgmt/snmp_syms.o \ 
    67                         ../adsl/mgmt/adsl2reg.o \ 
    68                         ../adsl/mgmt/adslutils.o \ 
    69                         ../adsl/mgmt/cmvutils.o \ 
    70                         ../../ap_code/atm/atmapload.o \ 
    71                         ../../ap_code/atm/utpconfig.o \ 
    72                         ../../ap_code/atm/atmhost.o \ 
    73                         ../../ap_code/atm/oamresponse.o \ 
    74                         ../../ap_code/atm/crc10.o \ 
    75                         ../../ap_code/atm/plane.o \ 
    76                         ../../ap_code/atm/atmmain.o \ 
    77                         ../../ap_code/atm/atmapi.o \ 
    78                         ../../ap_code/atm/atm_misc.o 
    79  
  • .6.32/fusiv_src/kernel/drivers/bm/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/bm/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/bm/Makefile
    old new  
    1 # 
    2 #/* Copyright (C) 2006 Ikanos Communications 
    3 # * See IKANOS_PROP_LICENSE.txt for license information. */ 
    4 # 
    5  
    6 EXTRA_CFLAGS += -DBUFFMANAGER 
    7 BMDRV_OBJ :=    bmdriver.o \ 
    8                 ../../ap_code/user_config/bm/bmapif.o \ 
    9                 ../../ap_code/buffmanager/apbmload.o \ 
    10                 ../../ap_code/buffmanager/apbm_syms.o  
    11                 #../../ap_code/buffmanager/bmmain.o #This file is included in ap_code/lib/Makefile 
    12  
    13 obj-$(CONFIG_FUSIV_BMDRIVER) := bmdriver_lkm.o 
    14 bmdriver_lkm-objs := $(BMDRV_OBJ) 
    15  
    16 clean: 
    17     rm -f *.ko *.o *.mod.o */*.o *~ */*~ core .depend .*.cmd *.mod.c */.*.o.cmd 
    18     rm -rf .tmp_versions 
    19     rm -f ../../ap_code/buffmanager/*.o ../../ap_code/buffmanager/*.mod.o \ 
    20                 ../../ap_code/buffmanager/*.o.cmd 
    21     rm -f ../../ap_code/user_config/bm/*.o 
    22  
  • .6.32/fusiv_src/kernel/drivers/bmedriver/Kbuild

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/bmedriver/Kbuild 7320_linux-2.6.32/fusiv_src/kernel/drivers/bmedriver/Kbuild
    old new  
    1 # Makefile to build ipvoice for Linux 2.6 
    2 EXTRA_CFLAGS += -I$(PWD)/include -DLINUX_2_6 
    3  
    4 ifdef CONFIG_FUSIV_VX180 
    5 BME_OBJ := bmedriver_vx180.o 
    6 else 
    7 BME_OBJ := bmedriver.o bmeapi.o 
    8 endif 
    9  
    10 obj-m :=  bmedrv.o 
    11 bmedrv-objs := $(BME_OBJ) 
  • .6.32/fusiv_src/kernel/drivers/btuart/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/btuart/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/btuart/Makefile
    old new  
    1  
    2 #*********************************************************************** 
    3 #*                                                                     * 
    4 #*   MODULE:  Bluetooth Uart2 Driver Interface Makefile                         *  
    5 #*                                                                     * 
    6 #*---------------------------------------------------------------------* 
    7  
    8 obj-y   := btuart_fusiv.o 
  • .6.32/fusiv_src/kernel/drivers/ethdriver/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/ethdriver/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/ethdriver/Makefile
    old new  
    1 # 
    2 #/* Copyright (C) 2006 Ikanos Communications 
    3 # * See IKANOS_PROP_LICENSE.txt for license information. */ 
    4 # 
    5  
    6 SYSUTIL_OBJ := sysutil_kernel_code.o 
    7 ETHDRIVER_OBJ :=        driver.o userif.o oswrapper.o \ 
    8                         ../../ap_code/ethdriver/fusiv/osif.o \ 
    9                         ../../ap_code/ethdriver/phy/ieeephy.o \ 
    10                         ../../ap_code/ethdriver/std_ap/sraap.o \ 
    11                         ../../ap_code/ethdriver/std_ap/switchvlan.o \ 
    12                         ../../ap_code/ethdriver/std_ap/apethload.o \ 
    13                         ../../ap_code/ethdriver/std_ap/eth_syms.o \ 
    14                         ../../ap_code/user_config/eth/ethapif.o 
    15 ifeq ($(CONFIG_FUSIV_VX180),y) 
    16 ETHDRIVER_OBJ +=        ../../ap_code/ethdriver/std_ap/ethap_vx180.o 
    17 else 
    18 ETHDRIVER_OBJ +=        ../../ap_code/ethdriver/std_ap/ethap.o 
    19 endif 
    20  
    21 obj-$(CONFIG_FUSIV_KERNEL_ETHERNET) := ethdriver_lkm.o sysKCode_lkm.o 
    22 ethdriver_lkm-objs := $(ETHDRIVER_OBJ) 
    23 sysKCode_lkm-objs := $(SYSUTIL_OBJ) 
    24  
    25 clean: 
    26     rm -f *.ko *.o *.mod.o */*.o *~ */*~ core .depend .*.cmd *.mod.c */.*.o.cmd 
    27     rm -rf .tmp_versions 
    28     rm -f ../../ap_code/ethdriver/fusiv/osif.o 
    29     rm -f ../../ap_code/ethdriver/phy/ieeephy.o 
    30     rm -f ../../ap_code/ethdriver/std_ap/sraap.o 
    31     rm -f ../../ap_code/ethdriver/std_ap/apethload.o 
    32     rm -f ../../ap_code/ethdriver/std_ap/ethap.o 
    33     rm -f ../../ap_code/ethdriver/std_ap/eth_syms.o 
    34     rm -f ../../ap_code/user_config/eth/ethapif.o 
    35  
  • .6.32/fusiv_src/kernel/drivers/igmpsnoop/Kbuild

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/igmpsnoop/Kbuild 7320_linux-2.6.32/fusiv_src/kernel/drivers/igmpsnoop/Kbuild
    old new  
    1  
    2 EXTRA_CFLAGS += -I$(PWD)/include 
    3 IGMP_SNOOP_OBJ := br_igmp_snoop.o br_igmp_snoop_ap.o 
    4  
    5 obj-$(CONFIG_FUSIV_KERNEL_IGMP_SNOOP) :=  igmpsnoop_lkm.o 
    6 igmpsnoop_lkm-objs := $(IGMP_SNOOP_OBJ) 
  • .6.32/fusiv_src/kernel/drivers/ipqos/Kbuild

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/ipqos/Kbuild 7320_linux-2.6.32/fusiv_src/kernel/drivers/ipqos/Kbuild
    old new  
    1 # Makefile to build ipvoice for Linux 2.6 
    2  
    3 EXTRA_CFLAGS += -I$(PWD)/include -DLINUX_2_6 $(LOCAL_IPQOS_FLAGS)  
    4 IPQOS_OBJ := ipt_fusivTC.o ipqos.o wfqlib.o wfqtimer.o qoslib.o qosconf.o 
    5  
    6 obj-m :=  ipqos_lkm.o  
    7 ipqos_lkm-objs := $(IPQOS_OBJ) 
    8  
    9  
  • .6.32/fusiv_src/kernel/drivers/ipqos/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/ipqos/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/ipqos/Makefile
    old new  
    1 #!/bin/sh 
    2 temp1 = $(PWD) 
    3 pace := 
    4 remove := fusiv_src/kernel/drivers/ipqos 
    5 IPQOS_LINUX_KERNEL_PATH := $(subst $(remove),$(comma),$(temp1))linux-2.6.18 
    6 RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc \) -prune -o 
    7  
    8 ipqos_lkm: 
    9     make -C $(IPQOS_LINUX_KERNEL_PATH)  M=$(PWD) LOCAL_IPQOS_FLAGS="-DCONFIG_FUSIV_KERNEL_IPQOS_TRAFFIC_SCHEDULER -DCONFIG_FUSIV_KERNEL_IPQOS_STATISTICS -DCONFIG_FUSIV_KERNEL_AP_2_AP_MODULE -DCONFIG_FUSIV_KERNEL_IPQOS_APQOS -DCONFIG_FUSIV_KERNEL_IPQOS_TC_MARKING -DCONFIG_FUSIV_KERNEL_IPQOS_TC_PRIORITY_CONVERSION -DCONFIG_FUSIV_KERNEL_IPQOS_TC_MAPPING -DCONFIG_FUSIV_KERNEL_IPQOS_DEBUG_LOG -DATM_UPSTREAM_THRU_HOST"  
    10  
    11 clean: 
    12     @find ./ \ 
    13             \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ 
    14                       -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \ 
    15                                         -type f -print | xargs rm -f 
    16  
  • .6.32/fusiv_src/kernel/drivers/monif/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/monif/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/monif/Makefile
    old new  
    1 # 
    2 #/* Copyright (C) 2006 Ikanos Communications 
    3 # * See IKANOS_PROP_LICENSE.txt for license information. */ 
    4 # 
    5  
    6 MONIF_OBJ := monif.o 
    7  
    8 obj-$(CONFIG_FUSIV_KERNEL_MONIF) := monif_lkm.o 
    9 monif_lkm-objs := $(MONIF_OBJ) 
    10  
    11 clean: 
    12     rm -f *.ko *.o *.mod.o */*.o *~ */*~ core .depend .*.cmd *.mod.c */.*.o.cmd 
    13     rm -rf .tmp_versions 
    14  
  • .6.32/fusiv_src/kernel/drivers/opensrc/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/opensrc/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/opensrc/Makefile
    old new  
    1 # 
    2 #/* Copyright (C) 2006 Ikanos Communications 
    3 # * See IKANOS_PROP_LICENSE.txt for license information. */ 
    4 # 
    5  
    6 #for this we used CONFIG_FUSIV_LIBRARY, no need of new one.. 
    7  
    8 OPENSRC_OBJ :=  opensrc.o \ 
    9         bme.o \ 
    10         voice.o 
    11  
    12 obj-$(CONFIG_FUSIV_LIBRARY) := opensrc_lkm.o 
    13 opensrc_lkm-objs := $(OPENSRC_OBJ) 
    14  
    15 clean: 
    16     rm -f *.ko *.o *.mod.o */*.o *~ */*~ core .depend .*.cmd *.mod.c */.*.o.cmd 
    17  
  • .6.32/fusiv_src/kernel/drivers/peri_ap/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/peri_ap/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/peri_ap/Makefile
    old new  
    1  
    2  # ============================================================================= 
    3  # 
    4  # Copyright (C) 2005 Analog Devices Inc. All rights reserved 
    5  # 
    6  # The information and source code contained herein is the exclusive property 
    7  # of Analog Devices and may not be disclosed, examined or reproduced in whole 
    8  # or in part without the explicit written authorization from Analog Devices. 
    9  # 
    10  # =========================================================================== 
    11  
    12 EXTRA_CFLAGS += -DPER 
    13 PERIAPDRIVER_OBJ :=             peri_ap_driver.o  \ 
    14                 ../../ap_code/peri_ap/apperiload.o \ 
    15                 ../../ap_code/user_config/peri/periapif.o 
    16  
    17 ifeq ($(CONFIG_FUSIV_VX180),y) 
    18 PERIAPDRIVER_OBJ += ../../ap_code/peri_ap/periapmain_vx180.o 
    19 else 
    20 PERIAPDRIVER_OBJ += ../../ap_code/peri_ap/periapmain.o 
    21 endif 
    22  
    23 obj-$(CONFIG_FUSIV_KERNEL_PERI_AP) := periap_driver_lkm.o 
    24 periap_driver_lkm-objs := $(PERIAPDRIVER_OBJ) 
    25  
    26 clean: 
    27     rm -f *.ko *.o *.mod.o */*.o *~ */*~ core .depend .*.cmd *.mod.c */.*.o.cmd 
    28     rm -rf .tmp_versions \ 
    29     rm ../../ap_code/peri_ap/apperiload.o \ 
    30     rm ../../ap_code/peri_ap/periapmain.o 
  • .6.32/fusiv_src/kernel/drivers/policyVlan/Kbuild

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/policyVlan/Kbuild 7320_linux-2.6.32/fusiv_src/kernel/drivers/policyVlan/Kbuild
    old new  
    1  
    2 EXTRA_CFLAGS += -I$(PWD)/include 
    3 VLANCLASSIFIER_OBJ := vlan_classifier.o policy_vlan.o 
    4  
    5 obj-$(CONFIG_FUSIV_KERNEL_POLICY_VLAN) :=  vlan_classifier_lkm.o 
    6 vlan_classifier_lkm-objs := $(VLANCLASSIFIER_OBJ) 
    7  
  • .6.32/fusiv_src/kernel/drivers/pppoer/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/pppoer/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/pppoer/Makefile
    old new  
    1 # 
    2 #/* Copyright (C) 2006 Ikanos Communications 
    3 # * See IKANOS_PROP_LICENSE.txt for license information. */ 
    4 # 
    5  
    6 PPPRELAY_OBJ := pppoerdrv.o pppoerelay.o ppprelaylib.o ppprelayconf.o ppprelayflashconf.o 
    7  
    8 obj-$(CONFIG_FUSIV_KERNEL_PPPOE_RELAY) := pppRelay_lkm.o 
    9 pppRelay_lkm-objs := $(PPPRELAY_OBJ) 
    10  
    11 clean: 
    12     rm -f *.ko *.o *.mod.o */*.o *~ */*~ core .depend .*.cmd *.mod.c */.*.o.cmd 
    13     rm -rf .tmp_versions 
  • .6.32/fusiv_src/kernel/drivers/timerlib/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/timerlib/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/timerlib/Makefile
    old new  
    1 # 
    2 #/* Copyright (C) 2006 Ikanos Communications 
    3 # * See IKANOS_PROP_LICENSE.txt for license information. */ 
    4 # 
    5  
    6 TIMER_OBJ := timers.o 
    7  
    8 obj-$(CONFIG_FUSIV_TIMERS) := timers_lkm.o 
    9 timers_lkm-objs := $(TIMER_OBJ) 
    10  
    11 clean: 
    12     rm -f *.ko *.o *.mod.o */*.o *~ */*~ core .depend .*.cmd *.mod.c */.*.o.cmd 
    13     rm -rf .tmp_versions 
    14  
  • .6.32/fusiv_src/kernel/drivers/uart2/Kbuild

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/uart2/Kbuild 7320_linux-2.6.32/fusiv_src/kernel/drivers/uart2/Kbuild
    old new  
    1  
    2 #*********************************************************************** 
    3 #*                                                                     * 
    4 #*   MODULE:  Serial Driver Interface Makefile                         *  
    5 #*                                                                     * 
    6 #*---------------------------------------------------------------------* 
    7 UART_OBJ := uart2c.o uartclock.o uartTransmit.o uartTest.o 
    8 obj-m   := uart2.o 
    9 uart2-objs := $(UART_OBJ) 
  • .6.32/fusiv_src/kernel/drivers/uart2/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/uart2/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/uart2/Makefile
    old new  
    1  
    2 #*********************************************************************** 
    3 #*                                                                     * 
    4 #*   MODULE:  Serial Driver Interface Makefile                         *  
    5 #*                                                                     * 
    6 #*---------------------------------------------------------------------* 
    7  
    8 obj-y   := uart2c.o uartclock.o uartTransmit.o uartTest.o 
  • .6.32/fusiv_src/kernel/drivers/vdsldriver/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/vdsldriver/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/vdsldriver/Makefile
    old new  
    1 # 
    2 #/* Copyright (C) 2006 Ikanos Communications 
    3 # * See IKANOS_PROP_LICENSE.txt for license information. */ 
    4 # 
    5  
    6 VDSLDRIVER_OBJ :=        vdsldriver.o \ 
    7             ../../ap_code/vdsl_ptm/driver/vdslptm.o \ 
    8             ../../ap_code/vdsl_ptm/driver/vdslptmdriver.o \ 
    9             ../../ap_code/vdsl_ptm/phy/fusiv_decoder.o \ 
    10             ../../ap_code/vdsl_ptm/phy/fusiv_encoder.o \ 
    11             ../../ap_code/vdsl_ptm/phy/fusiv_rx_slb.o \ 
    12             ../../ap_code/vdsl_ptm/phy/fusiv_tx_slb.o \ 
    13             ../../ap_code/vdsl_ptm/ptmap/apptmload.o \ 
    14             ../../ap_code/vdsl_ptm/ptmap/vdslptmmain.o \ 
    15             ../../ap_code/user_config/vdsl_ptm/vdslptmif.o 
    16  
    17 obj-$(CONFIG_FUSIV_KERNEL_BME_DRIVER_VX180) := vdsldriver_lkm.o 
    18 vdsldriver_lkm-objs := $(VDSLDRIVER_OBJ) 
    19  
    20 clean: 
    21     rm -f *.ko *.o *.mod.o */*.o *~ */*~ core .depend .*.cmd *.mod.c */.*.o.cmd 
    22     rm -rf .tmp_versions 
    23  
  • .6.32/fusiv_src/kernel/drivers/voice/ipvoice/conf/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/voice/ipvoice/conf/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/voice/ipvoice/conf/Makefile
    old new  
    1 #Makfile to compile CONFIGURATION  dependent files. 
    2  
    3  
    4 CONF_OBJ += $(IPVOICE_DRV_OBJ_DIR)/voicelib.o 
    5  
    6 $(IPVOICE_DRV_OBJ_DIR)/%.o  :%.c 
    7     $(IPVOICE_CC) $(VOICE_FLAGS) -c $< -o $@ 
    8  
    9 all: $(CONF_OBJ) 
    10  
    11 clean: 
    12     \rm -f $(CONF_OBJ) 
  • .6.32/fusiv_src/kernel/drivers/voice/ipvoice/dspipc/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/voice/ipvoice/dspipc/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/voice/ipvoice/dspipc/Makefile
    old new  
    1 #Makfile to compile dspipc drivers. 
    2  
    3  
    4 DSPIPC_OBJ=\ 
    5     $(IPVOICE_DRV_OBJ_DIR)/dspinit.o\ 
    6     $(IPVOICE_DRV_OBJ_DIR)/voiceopt.o\ 
    7     $(IPVOICE_DRV_OBJ_DIR)/dspipc.o 
    8  
    9 $(IPVOICE_DRV_OBJ_DIR)/%.o  :%.c 
    10     $(IPVOICE_CC) $(VOICE_FLAGS) -I./include -I./$(SLIC_VENDOR)/include -c $< -o $@ 
    11  
    12 all: $(DSPIPC_OBJ) 
    13 clean: 
    14     \rm -f $(DSPIPC_OBJ) 
  • .6.32/fusiv_src/kernel/drivers/voice/ipvoice/dsplib/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/voice/ipvoice/dsplib/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/voice/ipvoice/dsplib/Makefile
    old new  
    1 #Makfile to compile dsplib drivers. 
    2  
    3  
    4 DSPLIB_OBJ :=\ 
    5     $(IPVOICE_DRV_OBJ_DIR)/JitMain.o\ 
    6     $(IPVOICE_DRV_OBJ_DIR)/AJBCli.o\ 
    7     $(IPVOICE_DRV_OBJ_DIR)/AJBDelayEst.o\ 
    8     $(IPVOICE_DRV_OBJ_DIR)/AJBStat.o\ 
    9     $(IPVOICE_DRV_OBJ_DIR)/CidGeneration.o\ 
    10     $(IPVOICE_DRV_OBJ_DIR)/ToneGen.o\ 
    11     $(IPVOICE_DRV_OBJ_DIR)/ToneGenApi.o\ 
    12     $(IPVOICE_DRV_OBJ_DIR)/SinGen.o\ 
    13     $(IPVOICE_DRV_OBJ_DIR)/HDtmfrxDet.o\ 
    14     $(IPVOICE_DRV_OBJ_DIR)/HDtmfrxVar.o\ 
    15     $(IPVOICE_DRV_OBJ_DIR)/G711PLCMain.o\ 
    16     $(IPVOICE_DRV_OBJ_DIR)/G711PLC_AddHist.o\ 
    17     $(IPVOICE_DRV_OBJ_DIR)/G711PLC_Pitch.o\ 
    18     $(IPVOICE_DRV_OBJ_DIR)/G711PlcLib.o\ 
    19     $(IPVOICE_DRV_OBJ_DIR)/G711Table.o\ 
    20     $(IPVOICE_DRV_OBJ_DIR)/G711plc.o\ 
    21     $(IPVOICE_DRV_OBJ_DIR)/ToneFourCad.o\ 
    22     $(IPVOICE_DRV_OBJ_DIR)/G711PLCBasic_op.o\ 
    23         $(IPVOICE_DRV_OBJ_DIR)/CidRxMain.o\ 
    24         $(IPVOICE_DRV_OBJ_DIR)/rc8096.o\ 
    25     $(IPVOICE_DRV_OBJ_DIR)/clprgDet.o 
    26      
    27  
    28  
    29 $(IPVOICE_DRV_OBJ_DIR)/%.o  :%.c 
    30     $(IPVOICE_CC) $(VOICE_FLAGS) -c $< -o $@ 
    31  
    32 all: $(DSPLIB_OBJ) 
    33  
    34 clean: 
    35     \rm -f $(DSPLIB_OBJ) 
  • .6.32/fusiv_src/kernel/drivers/voice/ipvoice/Kbuild

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/voice/ipvoice/Kbuild 7320_linux-2.6.32/fusiv_src/kernel/drivers/voice/ipvoice/Kbuild
    old new  
    1 #!/bin/sh 
    2  
    3 temp1 = $(PWD) 
    4 space := 
    5 remove := /fusiv_src/kernel/drivers/voice/ipvoice 
    6 temp2  := $(subst $(remove),$(space),$(temp1)) 
    7 remove :=  linux-2.6.18 
    8 temp2  := $(subst $(remove),$(space),$(temp2)) 
    9 ifeq "$(FUSIV_SRCDIR)" "" 
    10 VOICE_LINUX_KERNEL_PATH := $(temp2)/fusiv_src/kernel/drivers/voice/ipvoice/include 
    11 else 
    12 VOICE_LINUX_KERNEL_PATH := $(FUSIV_SRCDIR)/kernel/drivers/voice/ipvoice/include 
    13 endif 
    14  
    15 EXTRA_CFLAGS += -I$(VOICE_LINUX_KERNEL_PATH) 
    16  
    17 DSPLIB_OBJ :=\ 
    18     dsplib/JitMain.o\ 
    19     dsplib/AJBCli.o\ 
    20     dsplib/AJBDelayEst.o\ 
    21     dsplib/AJBStat.o\ 
    22     dsplib/CidGeneration.o\ 
    23     dsplib/ToneGen.o\ 
    24     dsplib/ToneGenApi.o\ 
    25     dsplib/SinGen.o\ 
    26     dsplib/HDtmfrxDet.o\ 
    27     dsplib/HDtmfrxVar.o\ 
    28     dsplib/G711PLCMain.o\ 
    29     dsplib/G711PLC_AddHist.o\ 
    30     dsplib/G711PLC_Pitch.o\ 
    31     dsplib/G711PlcLib.o\ 
    32     dsplib/G711Table.o\ 
    33     dsplib/G711plc.o\ 
    34     dsplib/ToneFourCad.o\ 
    35     dsplib/CidRxMain.o\ 
    36     dsplib/rc8096.o\ 
    37     dsplib/clprgDet.o\ 
    38     dsplib/G711PLCBasic_op.o\ 
    39     dsplib/rxvaddspFunc.o\ 
    40     dsplib/rxvadMain.o\ 
    41     dsplib/rxvadVar.o\ 
    42     dsplib/rxvadFunc.o\ 
    43         dsplib/v21/v21agc.o\ 
    44         dsplib/v21/v21data.o\ 
    45         dsplib/v21/v21det.o\ 
    46         dsplib/v21/v21detmem.o\ 
    47         dsplib/v21/v21filter.o\ 
    48         dsplib/v21/v21rtcnv.o\ 
    49         dsplib/v21/v21main.o\ 
    50         dsplib/v21/PtrInit.o\ 
    51         dsplib/v21/v21signal.o 
    52  
    53  
    54 CONF_OBJ := conf/voicelib.o 
    55  
    56 DSPIPC_OBJ :=\ 
    57     dspipc/dspinit.o\ 
    58     dspipc/dspnw.o\ 
    59     dspipc/dspdect.o\ 
    60     dspipc/dectsample.o\ 
    61     dspipc/dspipc.o 
    62          
    63 OSDEP_OBJ :=\ 
    64     osdep/oswrapper.o\ 
    65     osdep/dspdrv.o 
    66  
    67 SLIC_OBJ :=\ 
    68     slic/slicapi.o\ 
    69     slic/voicespi.o\ 
    70     slic/silabs/si3216.o\ 
    71     slic/silabs/si3050.o\ 
    72     slic/legerity/legerityrw.o\ 
    73     slic/legerity/legeritycoeff.o\ 
    74     slic/legerity/legerity78d11.o\ 
    75     slic/legerity/legerity88111.o\ 
    76     slic/legerity/legerity88221.o\ 
    77     slic/legerity/legerity88241.o\ 
    78     slic/legerity/legerity88010.o 
    79  
    80 KRTP_OBJ :=\ 
    81     krtp/rtpapi.o\ 
    82     krtp/rtpmsg.o\ 
    83     krtp/rtpxport.o\ 
    84     krtp/rtpdrv.o\ 
    85     krtp/rtcp.o 
    86  
    87  
    88 obj-m :=  dspvoice.o  
    89 dspvoice-objs := $(DSPLIB_OBJ) 
    90 dspvoice-objs += $(CONF_OBJ) 
    91 dspvoice-objs += $(DSPIPC_OBJ) 
    92 dspvoice-objs += $(OSDEP_OBJ) 
    93 dspvoice-objs += $(SLIC_OBJ) 
    94 dspvoice-objs += $(KRTP_OBJ) 
    95  
    96  
  • .6.32/fusiv_src/kernel/drivers/voice/ipvoice/osdep/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/voice/ipvoice/osdep/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/voice/ipvoice/osdep/Makefile
    old new  
    1 #Makfile to compile OS dependent files. 
    2  
    3  
    4 OS_OBJ := $(IPVOICE_DRV_OBJ_DIR)/oswrapper.o\ 
    5     $(IPVOICE_DRV_OBJ_DIR)/dspdrv.o 
    6  
    7 $(IPVOICE_DRV_OBJ_DIR)/%.o  :%.c 
    8     $(IPVOICE_CC) $(VOICE_FLAGS) -c $< -o $@ 
    9  
    10  
    11 all: $(OS_OBJ) 
    12  
    13 clean: 
    14     \rm -f $(OS_OBJ) 
  • .6.32/fusiv_src/kernel/drivers/voice/ipvoice/slic/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/voice/ipvoice/slic/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/voice/ipvoice/slic/Makefile
    old new  
    1 #Makfile to compile SLIC drivers. 
    2  
    3 SLIC_OBJ := $(IPVOICE_DRV_OBJ_DIR)/si3216.o 
    4 SLIC_OBJ += $(IPVOICE_DRV_OBJ_DIR)/si3050.o 
    5 SLIC_OBJ += $(IPVOICE_DRV_OBJ_DIR)/legerityrw.o 
    6 SLIC_OBJ += $(IPVOICE_DRV_OBJ_DIR)/legerity78d11.o 
    7 SLIC_OBJ += $(IPVOICE_DRV_OBJ_DIR)/legerity88111.o 
    8 SLIC_OBJ += $(IPVOICE_DRV_OBJ_DIR)/legerity88221.o 
    9 SLIC_OBJ += $(IPVOICE_DRV_OBJ_DIR)/voicespi.o 
    10 SLIC_OBJ += $(IPVOICE_DRV_OBJ_DIR)/slicapi.o 
    11  
    12 $(IPVOICE_DRV_OBJ_DIR)/%.o  :silabs/%.c 
    13     $(IPVOICE_CC) $(VOICE_FLAGS) -I$(PWD)/silabs/include -c $< -o $@ 
    14  
    15 $(IPVOICE_DRV_OBJ_DIR)/%.o  :legerity/%.c 
    16     $(IPVOICE_CC) $(VOICE_FLAGS) -I./silabs/include -c $< -o $@ 
    17  
    18 $(IPVOICE_DRV_OBJ_DIR)/%.o  :%.c 
    19     $(IPVOICE_CC) $(VOICE_FLAGS) -c $< -o $@ 
    20  
    21  
    22 all:    $(SLIC_OBJ) 
    23  
    24 clean: 
    25     \rm -f $(SLIC_OBJ) 
  • .6.32/fusiv_src/kernel/drivers/voice/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/drivers/voice/Makefile 7320_linux-2.6.32/fusiv_src/kernel/drivers/voice/Makefile
    old new  
    1 #!/bin/sh 
    2  
    3 temp1 = $(PWD) 
    4 space := 
    5 remove := fusiv_src/kernel/drivers/voice 
    6 VOICE_LINUX_KERNEL_PATH := $(subst $(remove),$(comma),$(temp1))linux-2.6.18 
    7 RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc \) -prune -o 
    8  
    9 dsp_driver:  
    10     echo $(VOICE_LINUX_KERNEL_PATH) 
    11     cd ipvoice; \ 
    12     make -C $(VOICE_LINUX_KERNEL_PATH)  M=$(PWD)/ipvoice; \ 
    13      
    14 dsp_firmware_install: 
    15 ifdef CONFIG_FUSIV_KERNEL_DSP_MODULE 
    16     echo  "Yes BUilding" 
    17 else 
    18     echo "not selected" 
    19 endif 
    20  
    21 clean:  
    22     @find ./ipvoice \ 
    23         \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ 
    24     -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \ 
    25                 -type f -print | xargs rm -f 
    26  
    27  
    28  
  • .6.32/fusiv_src/kernel/Kconfig

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/Kconfig 7320_linux-2.6.32/fusiv_src/kernel/Kconfig
    old new  
    1 # 
    2 # FUSIV Source Kernel Configuration 
    3 # 
    4  
    5 config MIPS_FUSIV 
    6     bool "Enable Ikanos Fusiv Configuration" 
    7     default n 
    8  
    9 menu "FUSIV Source Kernel Configuration" 
    10         depends on MIPS_FUSIV 
    11  
    12 config FUSIV_LIBRARY 
    13         tristate "Fusiv library files" 
    14         depends on MIPS_FUSIV 
    15         default m 
    16         help 
    17     Fusiv library files, this must be included 
    18  
    19 config FUSIV_TIMERS 
    20         tristate "Timers" 
    21         depends on MIPS_FUSIV && MIPS_FUSIV 
    22         default m 
    23         help 
    24     Fusiv timers, used by atmdrivers and pppoerelay 
    25  
    26 config FUSIV_KERNEL_AP_2_AP 
    27         depends on FUSIV_LIBRARY && MIPS_FUSIV 
    28         tristate "AP to AP Fastpath" 
    29         default m 
    30         help 
    31     AP to AP Fastpath option 
    32  
    33 config  MCAST_AP_SUPPORT 
    34         bool "AP Support for Multicast" 
    35         depends on FUSIV_KERNEL_AP_2_AP && MIPS_FUSIV 
    36         default n 
    37         help 
    38         AP Support when IGMP Snooping is not enabled. 
    39  
    40 config FUSIV_BMDRIVER 
    41         depends on FUSIV_LIBRARY && MIPS_FUSIV 
    42         tristate "Buffer Manager" 
    43         default m 
    44         help 
    45     Buffer Manager, allocate buffer for each packet 
    46  
    47 config FUSIV_KERNEL_ETHERNET 
    48         depends on FUSIV_BMDRIVER && MIPS_FUSIV 
    49         tristate "Ethernet Driver" 
    50         default m 
    51         help 
    52     Ethernet Driver, Buffer Manager and Fusiv Library files are required 
    53  
    54 config FUSIV_KERNEL_ATM 
    55         depends on FUSIV_BMDRIVER && MIPS_FUSIV 
    56         tristate "ATM Driver" 
    57     depends on FUSIV_TIMERS && MIPS_FUSIV 
    58         default m 
    59         help 
    60     Atm Driver, Buffer Manager and Fusiv Library files are required 
    61  
    62 config FUSIV_KERNEL_ACL 
    63         depends on FUSIV_BMDRIVER && MIPS_FUSIV 
    64         tristate "ACL Driver" 
    65         default n 
    66         help 
    67         ACL (L2/L3/L4) filtering support 
    68  
    69 choice 
    70        prompt "ACL AP support" 
    71  
    72 config FUSIV_KERNEL_ACL_EMAC3 
    73         depends on FUSIV_KERNEL_ACL && MIPS_FUSIV 
    74         bool "ACL Support on EMAC3" 
    75  
    76 config FUSIV_KERNEL_ACL_SPA 
    77         depends on FUSIV_KERNEL_ACL && MIPS_FUSIV 
    78         bool "ACL Support on SPA" 
    79         default y 
    80 endchoice 
    81  
    82 config FUSIV_KERNEL_PPPOE_RELAY 
    83         tristate "PPP over Ethernet Relay" 
    84         depends on PPPOE && MIPS_FUSIV 
    85     depends on FUSIV_LIBRARY && MIPS_FUSIV 
    86     depends on FUSIV_TIMERS && MIPS_FUSIV 
    87         default n 
    88         help 
    89         Support for PPP over Ethernet Relay. Depends of Fusiv Library and Fusiv Timers. 
    90  
    91  
    92 config FUSIV_KERNEL_WLAN 
    93     tristate "Vindhya WLAN Driver" 
    94     default n 
    95     help 
    96  
    97 config FUSIV_KERNEL_PERI_AP 
    98         tristate "PERI AP Driver" 
    99         depends on FUSIV_KERNEL_AP_2_AP && MIPS_FUSIV 
    100         default n 
    101         help 
    102  
    103 choice 
    104         prompt "Atheros WLAN Driver" 
    105  
    106 config FUSIV_KERNEL_WLAN_ATH_11G 
    107         depends on MIPS_FUSIV 
    108         bool "Atheros WLAN 11g Driver" 
    109  
    110 config FUSIV_KERNEL_WLAN_ATH_11N 
    111         depends on MIPS_FUSIV 
    112         bool "Atheros WLAN 11g+11n Driver" 
    113  
    114 endchoice 
    115  
    116 config FUSIV_KERNEL_WLAN_RT_11N 
    117     tristate "Ralink WLAN 11n Driver" 
    118         depends on MIPS_FUSIV 
    119     default n 
    120     help 
    121  
    122 config FUSIV_KERNEL_DSP 
    123     tristate "Fusiv Based Voice Driver" 
    124         depends on MIPS_FUSIV 
    125     default n 
    126     help 
    127  
    128 menu "Voice Drivers Selection" 
    129         depends on MIPS_FUSIV 
    130  
    131 choice 
    132     depends on FUSIV_KERNEL_DSP && MIPS_FUSIV 
    133     prompt "Voice System Type" 
    134     default FUSIV_DSP_BASED_VOICE 
    135  
    136 config FUSIV_MIPS_BASED_VOICE 
    137         depends on MIPS_FUSIV && MIPS_FUSIV 
    138     bool "MIPS Based Voice System" 
    139      
    140 config FUSIV_DSP_BASED_VOICE 
    141         depends on MIPS_FUSIV && MIPS_FUSIV 
    142     bool "DSP Based Voice System" 
    143  
    144 endchoice 
    145 choice 
    146         depends on FUSIV_DSP_BASED_VOICE && MIPS_FUSIV 
    147         prompt "Voice Architecture Type" 
    148         default FUSIV_DSP_BASED_VOICE_V2_ARCH 
    149  
    150 config FUSIV_DSP_BASED_VOICE_V2_ARCH 
    151         bool "V2 VOICE Architecture - Supports 4PLUS2 & 2PLUS1 SLIC" 
    152         depends on MIPS_FUSIV 
    153  
    154 config FUSIV_DSP_BASED_VOICE_V1_ARCH 
    155         bool "V1 VOICE Architecture - Supports 2PLUS1 SLIC only" 
    156         depends on MIPS_FUSIV 
    157  
    158 endchoice 
    159  
    160 endmenu 
    161  
    162 config FUSIV_KERNEL_UART2 
    163         tristate "UART2 Driver" 
    164     depends on FUSIV_VX200 || FUSIV_AT300  
    165     depends on FUSIV_LIBRARY 
    166         default m 
    167         help 
    168  
    169 config FUSIV_KERNEL_BME 
    170         tristate "Fusiv BME Driver" 
    171     depends on FUSIV_VX160 
    172         default n 
    173         help 
    174         BME driver for Alaska. 
    175  
    176 config FUSIV_KERNEL_BME_DRIVER_VX180 
    177         tristate "Fusiv BME Driver" 
    178     depends on FUSIV_VX180 
    179         default n 
    180         help 
    181         BME driver for VX180. 
    182  
    183 config FUSIV_KERNEL_VX180_AVDSL 
    184         tristate "Fusiv AVDSL" 
    185     depends on FUSIV_VX180 
    186         default n 
    187         help 
    188         Fusiv kernel support for AVDSL on VX180 
    189  
    190 menu "Fusiv IPQoS Configurations" 
    191         depends on MIPS_FUSIV 
    192  
    193 config FUSIV_KERNEL_HOST_IPQOS 
    194         tristate "Fusiv IPQoS Configurations" 
    195         depends on MIPS_FUSIV 
    196         default n 
    197         help 
    198  
    199 config FUSIV_KERNEL_IPQOS_TRAFFIC_SCHEDULER 
    200                 bool "Host Based IPQoS Traffic Scheduler" 
    201                 depends on FUSIV_KERNEL_HOST_IPQOS 
    202                 default y 
    203                 help 
    204                 Host Based Bandwidth Management Module, refer Fusiv IPQoS document. 
    205  
    206 config FUSIV_KERNEL_IPQOS_APQOS 
    207                 bool "Fusiv AP based QoS Module" 
    208                 depends on FUSIV_KERNEL_HOST_IPQOS 
    209                 depends on FUSIV_KERNEL_AP_2_AP 
    210                 default y 
    211                 help 
    212                 AP Based IPQoS modules. 
    213  
    214 config FUSIV_KERNEL_IPQOS_TC_RATE_CONTROL 
    215                 bool "TC Rate Control Module" 
    216                 depends on FUSIV_KERNEL_HOST_IPQOS 
    217                 default n 
    218                 help  
    219                 Support of Traffic Conditioning Rate Control Module 
    220  
    221 config FUSIV_KERNEL_IPQOS_TC_MAPPING 
    222                 depends on FUSIV_KERNEL_HOST_IPQOS 
    223                 bool "TC QoS premptives (TOS/DSCP/COS) to Schedule Q Mapping" 
    224                 default y 
    225                 help 
    226                 Support for the QoS Mapping as defined in IPQoS document, TOS/COS/DSCP. 
    227  
    228 config FUSIV_KERNEL_IPQOS_TC_MARKING 
    229                 depends on FUSIV_KERNEL_HOST_IPQOS 
    230                 bool "TC TOS/COS/DSCP Marking" 
    231                 default y 
    232                 help 
    233                 Support of QoS Marking as defined in IPQoS document. 
    234  
    235 config FUSIV_KERNEL_IPQOS_TC_PRIORITY_CONVERSION 
    236                 depends on FUSIV_KERNEL_HOST_IPQOS 
    237                 bool "TC Priority Conversion/remarking (TOS/COS/DSCP)" 
    238                 default y 
    239                 help 
    240                 Support for QoS priority conversion / remarking from one to other (TOS/COS/DSCP) 
    241  
    242 config FUSIV_KERNEL_IPQOS_STATISTICS 
    243                 depends on FUSIV_KERNEL_HOST_IPQOS 
    244                 bool "IPQoS Statistics support" 
    245                 default y 
    246                 help 
    247                 Support to fetch the statistics, good idea to disable for the production. 
    248  
    249 config FUSIV_KERNEL_IPQOS_DEBUG_LOG 
    250                 depends on FUSIV_KERNEL_HOST_IPQOS 
    251                 bool "IPQoS Debugging Support" 
    252                 default y 
    253                 help 
    254                 Support to log QoS Debugging Information 
    255  
    256  
    257 endmenu 
    258  
    259 config FUSIV_KERNEL_PROFILER 
    260         tristate "GPT Based Simple Profiler" 
    261         depends on MIPS_FUSIV 
    262         default n 
    263         help 
    264  
    265 config FUSIV_KERNEL_MONIF 
    266     depends on FUSIV_KERNEL_ATM 
    267         tristate "ADSL Link Monitoring Interface device" 
    268         default m 
    269         help 
    270  
    271 config BT_HCI_FUSIV_UART2 
    272     bool "HCI FUSIV UART2 driver" 
    273     depends on FUSIV_VX160 
    274     help 
    275     Bluetooth HCI FUSIV UART2 driver. 
    276  
    277 config FUSIV_KERNEL_IGMP_SNOOP 
    278         tristate "IGMP Snoop" 
    279         depends on MIPS_FUSIV 
    280         default n 
    281         help 
    282         Support for IGMP Snooping 
    283  
    284 config  IGMP_SNOOP_AP_SUPPORT  
    285         bool "AP Support for IGMP Snooping" 
    286         depends on FUSIV_KERNEL_IGMP_SNOOP 
    287     depends on FUSIV_KERNEL_AP_2_AP 
    288         default n 
    289         help 
    290         AP Support for IGMP Snooping. 
    291  
    292 config FUSIV_KERNEL_POLICY_VLAN 
    293         tristate "Policy based VLAN" 
    294         depends on MIPS_FUSIV 
    295         default n 
    296         help 
    297         Support for Policy based vlan 
    298 config FUSIV_KERNEL_GPON 
    299         depends on FUSIV_VX180 
    300         tristate "GPON driver" 
    301         default m 
    302         help 
    303     GPON driver option 
    304  
    305 menu  "AP-BUF and SK-BUFF Mapping" 
    306         depends on MIPS_FUSIV 
    307  
    308 config  FUSIV_ENABLE_AP_MBUF 
    309         bool    "AP-BUFF TO SK-BUF Mapping" 
    310         depends on MIPS_FUSIV 
    311         default y 
    312         help 
    313  
    314 config  FUSIV_ENABLE_MBUF_AP 
    315         bool    "SK-BUF TO AP-BUFF Mapping" 
    316         depends on MIPS_FUSIV 
    317         default y 
    318  
    319 endmenu 
    320  
    321 choice 
    322     depends on FUSIV_VX180 
    323     prompt "MIPS Cacheing Policy" 
    324     default FUSIV_VX180_WRITE_THRU 
    325  
    326 config FUSIV_VX180_WRITE_THRU 
    327         depends on MIPS_FUSIV 
    328     bool "Write-through Cache Policy" 
    329      
    330 config FUSIV_VX180_WRITE_BACK 
    331         depends on MIPS_FUSIV 
    332     bool "Write-back Cache Policy" 
    333  
    334 endchoice 
    335  
    336 endmenu 
    337  
  • .6.32/fusiv_src/kernel/profiler/Kbuild

    diff -burN 7362_linux-2.6.32/fusiv_src/kernel/profiler/Kbuild 7320_linux-2.6.32/fusiv_src/kernel/profiler/Kbuild
    old new  
    1 PROFILE_OBJ :=  perftimer.o 
    2 obj-m = profiler.o 
    3 profiler-objs := $(PROFILE_OBJ) 
    4  
    5  
  • .6.32/fusiv_src/Makefile

    diff -burN 7362_linux-2.6.32/fusiv_src/Makefile 7320_linux-2.6.32/fusiv_src/Makefile
    old new  
    1 # 
    2 #/* Copyright (C) 2006 Ikanos Communications 
    3 # * See IKANOS_PROP_LICENSE.txt for license information. */ 
    4 # 
    5  
    6 include .config 
    7  
    8 obj-$(CONFIG_FUSIV_LIBRARY) += kernel/drivers/opensrc/ 
    9 obj-$(CONFIG_FUSIV_LIBRARY) += kernel/ap_code/lib/ 
    10 obj-$(CONFIG_FUSIV_BMDRIVER) += kernel/drivers/bm/ 
    11 obj-$(CONFIG_FUSIV_KERNEL_ETHERNET) += kernel/drivers/ethdriver/ 
    12 obj-$(CONFIG_FUSIV_KERNEL_PERI_AP) += kernel/drivers/peri_ap/ 
    13 obj-$(CONFIG_FUSIV_KERNEL_ATM) += kernel/drivers/atm/ 
    14 obj-$(CONFIG_FUSIV_TIMERS) += kernel/drivers/timerlib/ 
    15 obj-$(CONFIG_FUSIV_KERNEL_AP_2_AP) += kernel/drivers/ap2ap/ 
    16 obj-$(CONFIG_FUSIV_KERNEL_DSP) += kernel/drivers/voice/ipvoice/ 
    17 obj-$(CONFIG_FUSIV_KERNEL_UART2) += kernel/drivers/uart2/ 
    18 obj-$(CONFIG_BT_HCI_FUSIV_UART2)    += kernel/drivers/btuart/ 
    19 obj-$(CONFIG_FUSIV_KERNEL_PPPOE_RELAY) += kernel/drivers/pppoer/ 
    20 obj-$(CONFIG_FUSIV_KERNEL_MONIF) += kernel/drivers/monif/ 
    21 obj-$(CONFIG_FUSIV_KERNEL_BME) += kernel/drivers/bmedriver/ 
    22 obj-$(CONFIG_FUSIV_KERNEL_BME_DRIVER_VX180) += kernel/drivers/bmedriver/ 
    23 obj-$(CONFIG_FUSIV_KERNEL_BME_DRIVER_VX180) += kernel/drivers/vdsldriver/ 
    24 obj-$(CONFIG_FUSIV_KERNEL_ACL) += kernel/drivers/acl_ap/ 
    25 obj-$(CONFIG_FUSIV_KERNEL_POLICY_VLAN) += kernel/drivers/policyVlan/ 
    26  
  • .6.32/include/linux/avm_power.h

    diff -burN 7362_linux-2.6.32/include/linux/avm_power.h 7320_linux-2.6.32/include/linux/avm_power.h
    old new  
    8888/*--------------------------------------------------------------------------------*\ 
    8989 * Load-Control-Callback-Schnittstelle 
    9090 * load_reduce: 0 - 10 (0 keine Lastreduzierung, 10 max. Lastreduzierung)  
     91 * load_reduce: verodert:  LOAD_CONTROL_VOIPCALL 
     92 *                         LOAD_CONTROL_MULTICAST 
    9193 * context:     Pointer der in avm_powermanager_load_control_register angegeben wurde 
    9294\*--------------------------------------------------------------------------------*/ 
     95#define LOAD_CONTROL_REDUCEMASK  0xF 
     96#define LOAD_CONTROL_REDUCE(a)  ((a) & LOAD_CONTROL_REDUCEMASK) 
     97#define LOAD_CONTROL_VOIPCALL   (0x1 << 8) 
     98#define LOAD_CONTROL_MULTICAST  (0x1 << 9) 
     99 
    93100typedef void (*load_control_callback_t)(int load_reduce, void *context); 
    94101/*--------------------------------------------------------------------------------*\ 
    95102 * Callback registrieren 
     
    103110\*--------------------------------------------------------------------------------*/ 
    104111void avm_powermanager_load_control_release(void *handle) __attribute__ ((weak)); 
    105112 
    106  
    107113#define POWERMANAGEMENT_THROTTLE_ETH 
    108114 
    109115/*--------------------------------------------------------------------------------*\ 
     
    159165    powerdevice_usb_host3     = 18,       /*--- power_rate in Milli-Ampere ---*/  
    160166    powerdevice_dsp_loadrate  = 19,       /*--- (ADSL/VDSL-)DSP power_rate in % (100 - % Idle-Wert) ---*/     
    161167    powerdevice_vdsp_loadrate = 20,       /*--- Voice-DSP power_rate in % (100 - % Idle-Wert) ---*/     
    162     powerdevice_lte           = 21,       /*--- power_rate in Milli-Ampere ---*/ 
     168    powerdevice_lte           = 21,       /*--- power_rate in Milliwatt ---*/ 
    163169    powerdevice_maxdevices    = 22 
    164170}; 
    165171 
  • .6.32/include/linux/tffs.h

    diff -burN 7362_linux-2.6.32/include/linux/tffs.h 7320_linux-2.6.32/include/linux/tffs.h
    old new  
    473473    { FLASH_FS_MAC_BLUETOOTH,     "bluetooth" }, 
    474474    { FLASH_FS_COUNTRY,           "country" }, 
    475475    { FLASH_FS_CPUFREQUENCY,      "cpufrequency" }, 
    476     { FLASH_FS_CRASH,             "crash" }, 
     476    { FLASH_FS_CRASH,             "crash" },        /*--- genutzt fuer panic-log-marker  ---*/ 
    477477    /*--- { FLASH_FS_ETHADDR,           "ethaddr" }, ---*/ 
    478478    { FLASH_FS_FIRSTFREEADDRESS,  "firstfreeaddress" }, 
    479479    { FLASH_FS_FIRMWARE_INFO,     "firmware_info" }, 
  • .6.32/net/avm_pa/avm_pa.c

    diff -burN 7362_linux-2.6.32/net/avm_pa/avm_pa.c 7320_linux-2.6.32/net/avm_pa/avm_pa.c
    old new  
    29242924      session = next; 
    29252925   } 
    29262926 
     2927#if 0 
     2928   while ((session = ctx->sess_lru[AVM_PA_LRU_ACTIVE].lru_head) != 0 
     2929         && time_is_before_eq_jiffies(session->endtime)) { 
     2930      pa_kill_session_unlocked(session, "timeout"); 
     2931      ctx->stats.sess_timedout++; 
     2932   } 
     2933#endif 
     2934 
    29272935   session = ctx->sess_lru[AVM_PA_LRU_ACTIVE].lru_head; 
    29282936   while (session) { 
    29292937      next = session->lru_next; 
     
    52025210      ctx->load_reduce = 0; 
    52035211      return; 
    52045212   } 
    5205  
    5206    if (load_reduce < 0) load_reduce = 0; 
    5207    else if (load_reduce > 10) load_reduce = 10; 
     5213   load_reduce = LOAD_CONTROL_REDUCE(load_reduce); 
     5214   if (load_reduce > 10) load_reduce = 10; 
    52085215 
    52095216   if (load_reduce == 0) { 
    52105217      if (ctx->load_reduce) {