15 Jan, 2012

1 commit

  • * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (119 commits)
    MIPS: Delete unused function add_temporary_entry.
    MIPS: Set default pci cache line size.
    MIPS: Flush huge TLB
    MIPS: Octeon: Remove SYS_SUPPORTS_HIGHMEM.
    MIPS: Octeon: Add support for OCTEON II PCIe
    MIPS: Octeon: Update PCI Latency timer and enable more error reporting.
    MIPS: Alchemy: Update cpu-feature-overrides
    MIPS: Alchemy: db1200: Improve PB1200 detection.
    MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
    MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
    MIPS: Alchemy: irq: register pm at irq init time
    MIPS: Alchemy: Touchscreen support on DB1100
    MIPS: Alchemy: Hook up IrDA on DB1000/DB1100
    net/irda: convert au1k_ir to platform driver.
    MIPS: Alchemy: remove unused board headers
    MTD: nand: make au1550nd.c a platform_driver
    MIPS: Netlogic: Mark Netlogic chips as SMT capable
    MIPS: Netlogic: Add support for XLP 3XX cores
    MIPS: Netlogic: Merge some of XLR/XLP wakup code
    MIPS: Netlogic: Add default XLP config.
    ...

    Fix up trivial conflicts in arch/mips/kernel/{perf_event_mipsxx.c,
    traps.c} and drivers/tty/serial/Makefile

    Linus Torvalds
     

11 Jan, 2012

3 commits


07 Jan, 2012

3 commits

  • Convert from pci_scan_bus() to pci_scan_root_bus() and remove root bus
    resource fixups. This fixes the problem of "early" and "header" quirks
    seeing incorrect root bus resources.

    Based on original patch by Deng-Cheng Zhu.

    Reference: https://lkml.org/lkml/2011/8/26/89
    CC: Ralf Baechle
    Signed-off-by: Deng-Cheng Zhu
    Signed-off-by: Bjorn Helgaas
    Signed-off-by: Jesse Barnes

    Bjorn Helgaas
     
  • This patch removes MIPS' architecture-specific 'pcibios_set_master()'
    routine and lets the default PCI core based implementation handle PCI
    device 'latency timer' setup.

    No functional change.

    Acked-by: Ralf Baechle
    Signed-off-by: Myron Stowe
    Signed-off-by: Jesse Barnes

    Myron Stowe
     
  • The 'latency timer' of PCI devices, both Type 0 and Type 1,
    is setup in architecture-specific code [see: 'pcibios_set_master()'].
    There are two approaches being taken by all the architectures - check
    if the 'latency timer' is currently set between 16 and 255 and if not
    bring it within bounds, or, do nothing (and then there is the
    gratuitously different PA-RISC implementation).

    There is nothing architecture-specific about PCI's 'latency timer' so
    this patch pulls its setup functionality up into the PCI core by
    creating a generic 'pcibios_set_master()' function using the '__weak'
    attribute which can be used by all architectures as a default which,
    if necessary, can then be over-ridden by architecture-specific code.

    No functional change.

    Signed-off-by: Myron Stowe
    Signed-off-by: Jesse Barnes

    Myron Stowe
     

08 Dec, 2011

11 commits

  • OCTEON II SOCs have a different PCIe implementation than is present in
    OCTEON Plus.

    Signed-off-by: David Daney
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2985/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • Signed-off-by: David Daney
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2987/
    Patchwork: https://patchwork.linux-mips.org/patch/3161/
    Signed-off-by: Ralf Baechle

    David Daney
     
  • - Move code that can be shared with XLP (irq.c, smp.c, time.c and
    xlr_console.c) to arch/mips/netlogic/common
    - Add asm/netlogic/haldefs.h and asm/netlogic/common.h for common and
    io functions shared with XLP
    - remove type 'nlm_reg_t *' and use uint64_t for mmio offsets
    - Move XLR specific code in smp.c to xlr/wakeup.c
    - Move XLR specific PCI code from irq.c to mips/pci/pci-xlr.c
    - Provide API for pic functions called from common/irq.c

    Signed-off-by: Jayachandran C
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2964/
    Signed-off-by: Ralf Baechle

    Jayachandran C
     
  • The CPU_XLR config variable is sufficient for XLR compilation, the
    variable NLM_XLR can be removed.

    Signed-off-by: Jayachandran C
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2962/
    Signed-off-by: Ralf Baechle

    Jayachandran C
     
  • Add basic support for MSI.

    Signed-off-by: Ganesan Ramalingam
    Signed-off-by: Jayachandran C
    To: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2730/
    Signed-off-by: Ralf Baechle

    Ganesan Ramalingam
     
  • Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
    We run all interrupt handlers with interrupts disabled and we even check
    and yell when an interrupt handler returns with interrupts enabled (see
    commit [b738a50a: genirq: Warn when handler enables interrupts]).

    So now this flag is a NOOP and can be removed.

    [ralf@linux-mips.org: Fixed up conflicts in
    arch/mips/alchemy/common/dbdma.c, arch/mips/cavium-octeon/smp.c and
    arch/mips/kernel/perf_event.c.]

    Signed-off-by: Yong Zhang
    To: linux-kernel@vger.kernel.org
    Cc: tglx@linutronix.de
    linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2835/
    Signed-off-by: Ralf Baechle

    Yong Zhang
     
  • Signed-off-by: Maxime Bizon
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2892/
    Signed-off-by: Ralf Baechle

    Maxime Bizon
     
  • [ralf@linux-mips.org: Fixed the odd formatting of all break statements.]

    Signed-off-by: Rene Bolldorf
    Cc: linux-mips@linux-mips.org
    Cc: linux-kernel@vger.kernel.org
    Patchwork: https://patchwork.linux-mips.org/patch/3019/
    Signed-off-by: Ralf Baechle

    Rene Bolldorf
     
  • Move add_wired_entry to its own header file from where it will be
    always included. Patch up other users of add_wired_entry to also include
    the header as needed.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Panic() invokes printk() to add a \n internally, so panic arguments should
    not themselves end in \n. Panic invocations in arch/mips and elsewhere
    are inconsistently sometimes terminating in \n, sometimes not.

    Signed-off-by: Ralf Baechle

    Ralf Baechle
     
  • Move PCI Controller PM to syscore_ops since the platform_driver PM methods
    are called way too late on resume and far too early on suspend (after and
    before PCI device resume/suspend).
    This also allows to simplify wired entry management a bit.

    Signed-off-by: Manuel Lauss
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/3007/
    Signed-off-by: Ralf Baechle

    Manuel Lauss
     

14 Nov, 2011

1 commit

  • The code located at arch/mips/lantiq/ included module.h to be able to use
    the EXPORT_SYMBOL* macros. These can now be directly included using
    export.h.

    Signed-off-by: John Crispin
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2937/
    Signed-off-by: Ralf Baechle

    John Crispin
     

11 Nov, 2011

1 commit


07 Nov, 2011

1 commit

  • * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
    Revert "tracing: Include module.h in define_trace.h"
    irq: don't put module.h into irq.h for tracking irqgen modules.
    bluetooth: macroize two small inlines to avoid module.h
    ip_vs.h: fix implicit use of module_get/module_put from module.h
    nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
    include: replace linux/module.h with "struct module" wherever possible
    include: convert various register fcns to macros to avoid include chaining
    crypto.h: remove unused crypto_tfm_alg_modname() inline
    uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
    pm_runtime.h: explicitly requires notifier.h
    linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
    miscdevice.h: fix up implicit use of lists and types
    stop_machine.h: fix implicit use of smp.h for smp_processor_id
    of: fix implicit use of errno.h in include/linux/of.h
    of_platform.h: delete needless include
    acpi: remove module.h include from platform/aclinux.h
    miscdevice.h: delete unnecessary inclusion of module.h
    device_cgroup.h: delete needless include
    net: sch_generic remove redundant use of
    net: inet_timewait_sock doesnt need
    ...

    Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
    - drivers/media/dvb/frontends/dibx000_common.c
    - drivers/media/video/{mt9m111.c,ov6650.c}
    - drivers/mfd/ab3550-core.c
    - include/linux/dmaengine.h

    Linus Torvalds
     

04 Nov, 2011

1 commit

  • * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (37 commits)
    MIPS: O32: Provide definition of registers ta0 .. ta3.
    MIPS: perf: Add Octeon support for hardware perf.
    MIPS: perf: Add support for 64-bit perf counters.
    MIPS: perf: Reorganize contents of perf support files.
    MIPS: perf: Cleanup formatting in arch/mips/kernel/perf_event.c
    MIPS: Add accessor macros for 64-bit performance counter registers.
    MIPS: Add probes for more Octeon II CPUs.
    MIPS: Add more CPU identifiers for Octeon II CPUs.
    MIPS: XLR, XLS: Add comment for smp setup
    MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
    MIPS: JZ4740: GPIO: Simplify IRQ demuxer
    MIPS: JZ4740: Use generic irq chip
    MIPS: Alchemy: remove all CONFIG_SOC_AU1??? defines
    MIPS: Alchemy: kill au1xxx.h header
    MIPS: Alchemy: clean DMA code of CONFIG_SOC_AU1??? defines
    MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep
    MIPS: Alchemy: Redo PCI as platform driver
    MIPS: Alchemy: more base address cleanup
    MIPS: Alchemy: rewrite USB platform setup.
    MIPS: Alchemy: abstract USB block control register access
    ...

    Fix up trivial conflicts in:
    arch/mips/alchemy/devboards/db1x00/platform.c
    drivers/ide/Kconfig
    drivers/mmc/host/au1xmmc.c
    drivers/video/Kconfig
    sound/mips/Kconfig

    Linus Torvalds
     

01 Nov, 2011

1 commit


25 Oct, 2011

2 commits


21 Sep, 2011

2 commits

  • The bits used to set the PCI bus speed on AR9 are slightly different to
    those used on Danube.

    Signed-off-by: John Crispin
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2614/
    Signed-off-by: Ralf Baechle

    John Crispin
     
  • arch/mips/pci/pci-rc32434.c: In function 'rc32434_pci_init':
    arch/mips/pci/pci-rc32434.c:217:16: error: 'rcrc32434_res_pci_io1' undeclared (first use in this function)
    arch/mips/pci/pci-rc32434.c:217:16: note: each undeclared identifier is reported only once for each function it appears in
    make[1]: *** [arch/mips/pci/pci-rc32434.o] Error 1

    This problem is included in the following commit.

    commit 28f65c11f2ffb3957259dece647a24f8ad2e241b
    Author: Joe Perches
    Date: Thu Jun 9 09:13:32 2011 -0700

    treewide: Convert uses of struct resource to resource_size(ptr)

    Signed-off-by: Yoichi Yuasa
    Cc: linux-mips
    Cc: Joe Perches
    Patchwork: https://patchwork.linux-mips.org/patch/2654/
    Signed-off-by: Ralf Baechle

    Yoichi Yuasa
     

09 Aug, 2011

1 commit


27 Jul, 2011

1 commit

  • * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (31 commits)
    MIPS: Close races in TLB modify handlers.
    MIPS: Add uasm UASM_i_SRL_SAFE macro.
    MIPS: RB532: Use hex_to_bin()
    MIPS: Enable cpu_has_clo_clz for MIPS Technologies' platforms
    MIPS: PowerTV: Provide cpu-feature-overrides.h
    MIPS: Remove pointless return statement from empty void functions.
    MIPS: Limit fixrange_init() to the FIXMAP region
    MIPS: Install handlers for software IRQs
    MIPS: Move FIXADDR_TOP into spaces.h
    MIPS: Add SYNC after cacheflush
    MIPS: pfn_valid() is broken on low memory HIGHMEM systems
    MIPS: HIGHMEM DMA on noncoherent MIPS32 processors
    MIPS: topdown mmap support
    MIPS: Remove redundant addr_limit assignment on exec.
    MIPS: AR7: Replace __attribute__((__packed__)) with __packed
    MIPS: AR7: Remove 'space before tabs' in platform.c
    MIPS: Lantiq: Add missing clk_enable and clk_disable functions.
    MIPS: AR7: Fix trailing semicolon bug in clock.c
    MAINTAINERS: Update MIPS entry.
    MIPS: BCM63xx: Remove duplicate PERF_IRQSTAT_REG definition
    ...

    Linus Torvalds
     

21 Jul, 2011

1 commit


10 Jun, 2011

1 commit


19 May, 2011

2 commits

  • The Lantiq family of SoCs have a EBU (External Bus Unit). This patch adds
    the driver that allows us to use the EBU as a PCI controller. In order for
    PCI to work the EBU is set to endianess swap all the data. In addition we
    need to make use of SWAP_IO_SPACE for device->host DMA to work.

    The clock of the PCI works in several modes (internal/external). If this
    is not configured correctly the SoC will hang.

    Signed-off-by: John Crispin
    Signed-off-by: Ralph Hempel
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2250/
    Signed-off-by: Ralf Baechle

    John Crispin
     
  • Adds pci/pci-xlr.c to support for XLR PCI/PCI-X interface and XLS PCIe
    interface.
    Update irq.c to ack PCI interrupts, use irq handler data to do the
    PCI/PCIe bus ack.

    Signed-off-by: Jayachandran C
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/2337/
    Signed-off-by: Ralf Baechle

    Jayachandran C
     

31 Mar, 2011

1 commit


29 Mar, 2011

2 commits


15 Mar, 2011

1 commit


02 Nov, 2010

1 commit

  • "gadget", "through", "command", "maintain", "maintain", "controller", "address",
    "between", "initiali[zs]e", "instead", "function", "select", "already",
    "equal", "access", "management", "hierarchy", "registration", "interest",
    "relative", "memory", "offset", "already",

    Signed-off-by: Uwe Kleine-König
    Signed-off-by: Jiri Kosina

    Uwe Kleine-König
     

30 Oct, 2010

1 commit

  • All Octeon chips can support more than 4GB of RAM. Also due to how Octeon
    PCI is setup, even some configurations with less than 4GB of RAM will have
    portions that are not accessible from 32-bit devices.

    Enable the swiotlb code to handle the cases where a device cannot directly
    do DMA. This is a complete rewrite of the Octeon DMA mapping code.

    Signed-off-by: David Daney
    Patchwork: http://patchwork.linux-mips.org/patch/1639/
    Signed-off-by: Ralf Baechle

    David Daney
     

25 Oct, 2010

1 commit

  • * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
    Update broken web addresses in arch directory.
    Update broken web addresses in the kernel.
    Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
    Revert "Fix typo: configuation => configuration" partially
    ida: document IDA_BITMAP_LONGS calculation
    ext2: fix a typo on comment in ext2/inode.c
    drivers/scsi: Remove unnecessary casts of private_data
    drivers/s390: Remove unnecessary casts of private_data
    net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
    drivers/infiniband: Remove unnecessary casts of private_data
    drivers/gpu/drm: Remove unnecessary casts of private_data
    kernel/pm_qos_params.c: Remove unnecessary casts of private_data
    fs/ecryptfs: Remove unnecessary casts of private_data
    fs/seq_file.c: Remove unnecessary casts of private_data
    arm: uengine.c: remove C99 comments
    arm: scoop.c: remove C99 comments
    Fix typo configue => configure in comments
    Fix typo: configuation => configuration
    Fix typo interrest[ing|ed] => interest[ing|ed]
    Fix various typos of valid in comments
    ...

    Fix up trivial conflicts in:
    drivers/char/ipmi/ipmi_si_intf.c
    drivers/usb/gadget/rndis.c
    net/irda/irnet/irnet_ppp.c

    Linus Torvalds