summaryrefslogtreecommitdiffstats
path: root/arch/sh/drivers/pci
Commit message (Collapse)AuthorAgeFilesLines
* sh: Fix up large system memory handling for SH7780 PCI.Paul Mundt2010-02-011-6/+28
| | | | | | | | For systems that have more than 512MB we need to set up an additional mapping, this fixes up the rounding to the next power of two and splits out the mapping accordingly between the two local bus mapping windows. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Kill off broken type 1 PCI config access checks.Paul Mundt2010-01-304-37/+0
| | | | | | | | | | The host controllers only support type 1, so there's not much else to test for. Some of the older controllers also supported type 2 accesses, but we've never supported those, and likely never will. Beyond that, the P1SEG test is meaningless for 32-bit mode, so rather than refactoring it, just kill the type 1 test off completely. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: support PCI domains.Paul Mundt2010-01-291-2/+15
| | | | | | | | Newer SH parts are now commonly shipping with multiple controllers, so we wire up PCI domain support to deal with them. Shamelessly cloned from the MIPS implementation. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Bail out early on PCI resource conflicts.Paul Mundt2010-01-291-13/+9
| | | | | | | | Presently we just call in to request_resource() for the ioport and iomem resources without checking for errors. This has already hidden a couple of bugs, so add some error handling in for good measure. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Reworked SH7780 PCI initialization.Paul Mundt2010-01-295-145/+102
| | | | | | | | | | | This consolidates the PCI initialization code for all of the pci-sh7780 users, and sets up the memory window dynamically as opposed to using hardcoded window positions. A number of bugs were fixed at the same time, including the PIO handling and master abort timeout settings being incorrect. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Fix up read-only variable assignment in pcibios_align_resource().Paul Mundt2010-01-281-3/+1
| | | | | | arch/sh/drivers/pci/pci.c:167: error: assignment of read-only location '*res' Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Mass ctrl_in/outX to __raw_read/writeX conversion.Paul Mundt2010-01-264-16/+16
| | | | | | | | | | | The old ctrl in/out routines are non-portable and unsuitable for cross-platform use. While drivers/sh has already been sanitized, there is still quite a lot of code that is not. This converts the arch/sh/ bits over, which permits us to flag the routines as deprecated whilst still building with -Werror for the architecture code, and to ensure that future users are not added. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Generalize SH7786 PCIe support.Paul Mundt2010-01-151-2/+1
| | | | | | | | Previously this was only built in for Urquell boards, but the same approach can be used on SDK7786 now that the mode pin reading is supported, so make it generic to SH7786. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: move machtypes.h to include/generatedSam Ravnborg2009-12-121-1/+1
| | | | | | | Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Michal Marek <mmarek@suse.cz>
* sh: Kill off superfluous arch/sh/drivers/pci/Kconfig.Paul Mundt2009-10-271-7/+0
| | | | | | | | Now that this contains a grand total of 1 Kconfig option, it's hardly worth keeping split out. Roll CONFIG_PCI back in to the top-level architecture Kconfig, along with the other bus types. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Revamp PCI DMA coherence Kconfig bits.Paul Mundt2009-10-271-12/+0
| | | | | | | | | Leaving this configurable caused more trouble than it was ever worth, so just make it explicit. Boards that are verified one way or the other can fix up their selects accordingly. We presently default to non-coherent for most platforms. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Allow use of GENERIC_IOMAPDavid McKay2009-08-241-0/+4
| | | | | | | | | | | | | | | The synopsys PCI cell used in the later STMicro chips requires code to be run in order to do IO cycles, rather than just memory mapping the IO space. Rather than extending the existing SH infrastructure to allow this, use the GENERIC_IOMAP implmentation to save re-inventing the wheel. This set of changes allows the SH to be built with GENERIC_IOMAP enabled, it just ifdef's out the functions provided by the GENERIC_IOMAP implementation, and provides a few required missing functions. Signed-off-by: David McKay <david.mckay@st.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Initial PCI-Express support for SH7786 Urquell board.Paul Mundt2009-06-172-0/+356
| | | | | | | | | | | | | This adds initial support for the PCI-Express module in the SH7786, particularly as it relates to the urquell platform. Presently it is only supported in root complex mode, with endpoint mode still requiring more debugging. 29/32-bit mode and lane configurations are selectable via board mode pins, and are otherwise fixed. Only 4x and 1x PCI channels are presently handled, the PCI bridge still requires additional debugging and stabilization in hardware. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: SH7786 PCI ops.Paul Mundt2009-06-163-0/+724
| | | | | | | This adds in preliminary support for the SH7786 PCIe module PCI ops, and the corresponding module definitions. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Allow register_pci_controller() to handle overlapping regions.Paul Mundt2009-06-161-12/+2
| | | | | | | | Some host controllers (such as SH7786) have overlapping regions that are fixed in hardware. The resource allocator does the right thing in managing this space already, so the conflict case is non-fatal. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: remove duplicated #include'sHuang Weiyi2009-06-141-1/+0
| | | | | Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci-sh7780: Fix up for PCI_DISABLE_MWI changes.Paul Mundt2009-05-271-6/+1
| | | | | | | | This fixes a build error where references to pci_cache_line_size are undefined, as this ceases to be exported when PCI_DISABLE_MWI is enabled, as is now the default. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci-sh7751: Initialize io_map_base in controller definition.Paul Mundt2009-05-261-3/+2
| | | | | | | | | As there is only a single controller and remapping has no impact for the address range in question, just initialize it directly in the controller definition. This fixes up boot time warnings about not having the field initialized. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: Integrate the SH-5 onchip_remap() more coherently.Paul Mundt2009-05-071-2/+2
| | | | | | | | | | | Presently this is special-cased for early initialization. While there are situations where these static early initializations are still necessary, with minor changes it is possible to use this for the regular ioremap implementation as well. This allows us to kill off the special-casing for the remap completely and to start tidying up all of the SH-5 special-casing in drivers. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Rename pci-new.c to pci.c.Paul Mundt2009-04-203-5/+1
| | | | | | | pci-new.c is now in a state to replace the old pci.c, rename it accordingly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Roll pci-lib in to pci-new.Paul Mundt2009-04-203-225/+221
| | | | | | | Now that the pci-auto cruft is gone, pci-lib can go away. Roll it back in to pci-new.c where it originally split off from. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Kill off the last remnants of the now unused pci-auto code.Paul Mundt2009-04-204-640/+0
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Move the se7751 fixups in to arch/sh/drivers/pci/.Paul Mundt2009-04-202-0/+112
| | | | | | | | | The se7751 was still doing the PCI fixups in its own board directory, so we move it over to arch/sh/drivers/pci/ with the rest of the board fixups. It has bitrotted significantly over the years, so will still likely need a bit of work to bring back up to date. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Convert dreamcast to new-style interface.Paul Mundt2009-04-203-20/+14
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Consolidate lboxre2 and r2d IRQ fixups.Paul Mundt2009-04-204-57/+26
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Rename SH7751 platform ops files to fixups.Paul Mundt2009-04-205-4/+4
| | | | | | | None of these contain pci_ops, only IRQ routing bits, rename them accordingly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Rewrite SH7751 PCI support to follow SH7780.Paul Mundt2009-04-2010-305/+76
| | | | | | | | | This follows the similar sort of scheme that the refactored SH7780 code uses, using a 64MB CS3 mapping to handle the window0 case, and simply discarding window1. This vastly simplifies the code, and allows most of the board-specific setup to go die. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Rename ops-cayman -> fixups-cayman.Paul Mundt2009-04-202-1/+1
| | | | | | Now that ops-cayman.c only contains IRQ routing fixups, rename it. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Convert the SH-5 code over to the new interface.Paul Mundt2009-04-204-52/+23
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Tidy up the dreamcast PCI support.Paul Mundt2009-04-203-89/+117
| | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Kill off legacy ide quirks.Paul Mundt2009-04-202-42/+0
| | | | | | | | These fixups seem to have bitrotted a bit since their introduction in the 2.4 days. As we never had much use for them in the first place, and nothing is using them any more, kill them off the rest of the way. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Consolidate pcibios_setup() in pci-lib.Paul Mundt2009-04-204-35/+16
| | | | | | | This wasn't really being used for anything useful, so just stub it in pci-lib. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Flag the dreamcast BBA as IORESOURCE_PCI_FIXED.Paul Mundt2009-04-201-0/+7
| | | | | | | This isn't a real BAR, so prevent any attempts to move it, as we don't wish to encourage a bus luck by overzealous PCI initialization code. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Kill off superfluous lboxre2 pci fixups.Paul Mundt2009-04-202-43/+1
| | | | | | This is a verbatim copy of the r2d one, use that instead. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Kill off the now unused hose->io_base.Paul Mundt2009-04-202-9/+0
| | | | | | Nothing is using this any more, so kill it off. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Consolidate the remaining common bits.Paul Mundt2009-04-203-116/+64
| | | | | | | | | | | This moves the remaining common bits in to pci-lib. Thereby reducing pci.c/pci-new.c to simple bus fixups and controller registration. As more platforms are moved over, the old code will disappear completely and the pci-new bits will be rolled in to pci-lib, eventually replacing pci.c completely. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Consolidate bus<->resource mapping in pci-lib.Paul Mundt2009-04-203-45/+31
| | | | | | | | Now that the io and mem offsets are tracked accordingly, the pci-new version of the bus<->resource mappers can be used generically. This moves them in to pci-lib. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Track io and mem_offset per-channel.Paul Mundt2009-04-202-9/+11
| | | | | | This implements a per-hose offset for I/O and mem resources. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: New-style controller registration.Paul Mundt2009-04-202-72/+112
| | | | | | | | This moves off of the board_pci_channels[] approach for bus registration and over to a cleaner register_pci_controller(), all derived from the MIPS code. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Consolidate pci_iomap() and use the generic I/O base.Paul Mundt2009-04-203-70/+51
| | | | | | | | | | | This consolidates the pci_iomap() definitions and reworks how the I/O port base is handled. PCI channels can register their own I/O map base, or if none is provided, the system-wide generic I/O base is used instead. Functionally nothing changes, while this allows us to kill off lots of I/O address special casing and lookups. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Kill off unused pcibios_fixup().Paul Mundt2009-04-201-5/+0
| | | | | | | This is left over cruft that hasn't been used by anything in a long time, kill off bits that weren't purged previously. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Consolidate pcibios_align_resource() definitions.Paul Mundt2009-04-203-46/+42
| | | | | | | | This introduces a saner pcibios_align_resource() that can be used regardless of whether pci-auto or pci-new are being used, and consolidates it in pci-lib.c. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: HAVE_PCI_MMAP support.Paul Mundt2009-04-202-3/+29
| | | | | | Derived from the MIPS version, now uses pgprot_noncached(). Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Split out new-style PCI core.Paul Mundt2009-04-203-4/+258
| | | | | | | This splits off a 'pci-new.c' which is aimed at gradually replacing the pci-auto backend and the arch/sh/drivers/pci/pci.c core respectively. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Drop asm-generic/pci.h, so we can use our own fixups.Paul Mundt2009-04-201-0/+14
| | | | | | | The new PCI code wants its own bus<->resource mappings instead of the generic equivalents, so drop the asm-generic include in preparation. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Start unifying the SH7780 PCIC initialization.Paul Mundt2009-04-174-70/+37
| | | | | | | This starts moving out the common initialization bits from the various fixup paths in to the shared init path. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Consolidate SH7780 PCIC IRQ routing.Paul Mundt2009-04-177-137/+31
| | | | | | | | Now that the platform code is a bit leaner, we can start consolidating the various IRQ routing implementations. There are effectively only 2 variants, and the others can use those directly. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Kill off platform-specific multi-window mappings.Paul Mundt2009-04-176-95/+16
| | | | | | | | | | | Commit 68b42d1b548be1840aff7122fdebeb804daf0fa3 ("sh: sh7785lcr: Map whole PCI address space.") changed around the semantics of how various chip-selects are made accessible to PCI. Now that there is a single large mapping covering from CS0-CS6, there is no longer any need to do multi-window mapping. Subsequently, all of the differing implementations can be consolidated in to pci-sh7780. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Consolidate PCI I/O and mem window definitions for SH7780.Paul Mundt2009-04-176-90/+27
| | | | | | | | This consolidates all of the PCI I/O and memory window definitions across the pci-sh7780 users in pci-sh7780 itself. No functional changes, in that every platform had exactly the same implementation. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* sh: pci: Set the I/O port base to the SH7780 I/O window default.Paul Mundt2009-04-171-0/+2
| | | | | | | Presently the I/O port base isn't being set anywhere, which allows things like generic_inl() to blow up. Fix this up to point at the PCI IO window. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
OpenPOWER on IntegriCloud