mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 05:41:55 +00:00
e5d0c87439
This round the updates contain:
* A new driver for the Freescale PAMU IOMMU from Varun Sethi.
This driver has cooked for a while and required changes to the
IOMMU-API and infrastructure that were already merged before.
* Updates for the ARM-SMMU driver from Will Deacon
* Various fixes, the most important one is probably a fix from
Alex Williamson for a memory leak in the VT-d page-table
freeing code
In summary not all that much. The biggest part in the diffstat is the
new PAMU driver.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJSMdWFAAoJECvwRC2XARrjZbkP/3lYpEjd1SmqZAVUTPQw/H1Y
9DHFs39WZddlz73YkF2yDyprjdi2b8wUzOJGr0BJ0AWb97l3bcvouqRaw0Q8Sghc
sHYHHF/L/n6xkDVd8OXTGgQukjOu16yb1Ai1jlvlNgrB8T9lA0QKjSIDfVVJb99c
qGnO58UqnxOC7zzL5iqDfkgffre+dw4Ik2BddN6+gdPV907wsk7ze5nTDNTMkXso
oGi7jwbOTkuWyI6ST1GnkSV9bB1yUPR0Np0sFSOtGbsRSDOA4Ta96AHygZ3kPza+
ErylGBlHj0KG7oH7m3GOQAso6MeNdHa+7aIewaLz2NKundhPA6Kb3hFdghjGGPzR
ubJ3IiG7X/MPrp8iwNsPDoCaRkWWGR80L9vIlhD+yvfCx8PkkEUoEIbf1k4Gm0Ry
5ouROU77Ha2P6ZuGvPCTlok4ggKkV2mHdUuetC/04ETvA3kN+2TGjya/1wL+X+H/
fV3jyBRYWFaXNzKl3qKfol2ETG3hQA5NGNKuHMTJz8CF8jHSJeijDCeiWv363h62
oQ+CrUG7FJ4B9ZITGDzxA0MdFs5TIqRRp2vY8onaok5YAR3U/iiKRRv+YjIjZuE4
CTshhbb/mwwaTKvq8pq9xs/3rhGX+3HSP4jAzNWUJPYgouE+rvHq/H1ApI89IxJF
1wYemwLPo3fMcgOvw8pm
=UZoD
-----END PGP SIGNATURE-----
Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU Updates from Joerg Roedel:
"This round the updates contain:
- A new driver for the Freescale PAMU IOMMU from Varun Sethi.
This driver has cooked for a while and required changes to the
IOMMU-API and infrastructure that were already merged before.
- Updates for the ARM-SMMU driver from Will Deacon
- Various fixes, the most important one is probably a fix from Alex
Williamson for a memory leak in the VT-d page-table freeing code
In summary not all that much. The biggest part in the diffstat is the
new PAMU driver"
* tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
intel-iommu: Fix leaks in pagetable freeing
iommu/amd: Fix resource leak in iommu_init_device()
iommu/amd: Clean up unnecessary MSI/MSI-X capability find
iommu/arm-smmu: Simplify VMID and ASID allocation
iommu/arm-smmu: Don't use VMIDs for stage-1 translations
iommu/arm-smmu: Tighten up global fault reporting
iommu/arm-smmu: Remove broken big-endian check
iommu/fsl: Remove unnecessary 'fsl-pamu' prefixes
iommu/fsl: Fix whitespace problems noticed by git-am
iommu/fsl: Freescale PAMU driver and iommu implementation.
iommu/fsl: Add additional iommu attributes required by the PAMU driver.
powerpc: Add iommu domain pointer to device archdata
iommu/exynos: Remove dead code (set_prefbuf)
142 lines
5.1 KiB
C
142 lines
5.1 KiB
C
/*
|
|
* MPC85xx/86xx PCI Express structure define
|
|
*
|
|
* Copyright 2007,2011 Freescale Semiconductor, Inc
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
*/
|
|
|
|
#ifdef __KERNEL__
|
|
#ifndef __POWERPC_FSL_PCI_H
|
|
#define __POWERPC_FSL_PCI_H
|
|
|
|
struct platform_device;
|
|
|
|
|
|
/* FSL PCI controller BRR1 register */
|
|
#define PCI_FSL_BRR1 0xbf8
|
|
#define PCI_FSL_BRR1_VER 0xffff
|
|
|
|
#define PCIE_LTSSM 0x0404 /* PCIE Link Training and Status */
|
|
#define PCIE_LTSSM_L0 0x16 /* L0 state */
|
|
#define PCIE_IP_REV_2_2 0x02080202 /* PCIE IP block version Rev2.2 */
|
|
#define PCIE_IP_REV_3_0 0x02080300 /* PCIE IP block version Rev3.0 */
|
|
#define PIWAR_EN 0x80000000 /* Enable */
|
|
#define PIWAR_PF 0x20000000 /* prefetch */
|
|
#define PIWAR_TGI_LOCAL 0x00f00000 /* target - local memory */
|
|
#define PIWAR_READ_SNOOP 0x00050000
|
|
#define PIWAR_WRITE_SNOOP 0x00005000
|
|
#define PIWAR_SZ_MASK 0x0000003f
|
|
|
|
/* PCI/PCI Express outbound window reg */
|
|
struct pci_outbound_window_regs {
|
|
__be32 potar; /* 0x.0 - Outbound translation address register */
|
|
__be32 potear; /* 0x.4 - Outbound translation extended address register */
|
|
__be32 powbar; /* 0x.8 - Outbound window base address register */
|
|
u8 res1[4];
|
|
__be32 powar; /* 0x.10 - Outbound window attributes register */
|
|
u8 res2[12];
|
|
};
|
|
|
|
/* PCI/PCI Express inbound window reg */
|
|
struct pci_inbound_window_regs {
|
|
__be32 pitar; /* 0x.0 - Inbound translation address register */
|
|
u8 res1[4];
|
|
__be32 piwbar; /* 0x.8 - Inbound window base address register */
|
|
__be32 piwbear; /* 0x.c - Inbound window base extended address register */
|
|
__be32 piwar; /* 0x.10 - Inbound window attributes register */
|
|
u8 res2[12];
|
|
};
|
|
|
|
/* PCI/PCI Express IO block registers for 85xx/86xx */
|
|
struct ccsr_pci {
|
|
__be32 config_addr; /* 0x.000 - PCI/PCIE Configuration Address Register */
|
|
__be32 config_data; /* 0x.004 - PCI/PCIE Configuration Data Register */
|
|
__be32 int_ack; /* 0x.008 - PCI Interrupt Acknowledge Register */
|
|
__be32 pex_otb_cpl_tor; /* 0x.00c - PCIE Outbound completion timeout register */
|
|
__be32 pex_conf_tor; /* 0x.010 - PCIE configuration timeout register */
|
|
__be32 pex_config; /* 0x.014 - PCIE CONFIG Register */
|
|
__be32 pex_int_status; /* 0x.018 - PCIE interrupt status */
|
|
u8 res2[4];
|
|
__be32 pex_pme_mes_dr; /* 0x.020 - PCIE PME and message detect register */
|
|
__be32 pex_pme_mes_disr; /* 0x.024 - PCIE PME and message disable register */
|
|
__be32 pex_pme_mes_ier; /* 0x.028 - PCIE PME and message interrupt enable register */
|
|
__be32 pex_pmcr; /* 0x.02c - PCIE power management command register */
|
|
u8 res3[3016];
|
|
__be32 block_rev1; /* 0x.bf8 - PCIE Block Revision register 1 */
|
|
__be32 block_rev2; /* 0x.bfc - PCIE Block Revision register 2 */
|
|
|
|
/* PCI/PCI Express outbound window 0-4
|
|
* Window 0 is the default window and is the only window enabled upon reset.
|
|
* The default outbound register set is used when a transaction misses
|
|
* in all of the other outbound windows.
|
|
*/
|
|
struct pci_outbound_window_regs pow[5];
|
|
u8 res14[96];
|
|
struct pci_inbound_window_regs pmit; /* 0xd00 - 0xd9c Inbound MSI */
|
|
u8 res6[96];
|
|
/* PCI/PCI Express inbound window 3-0
|
|
* inbound window 1 supports only a 32-bit base address and does not
|
|
* define an inbound window base extended address register.
|
|
*/
|
|
struct pci_inbound_window_regs piw[4];
|
|
|
|
__be32 pex_err_dr; /* 0x.e00 - PCI/PCIE error detect register */
|
|
u8 res21[4];
|
|
__be32 pex_err_en; /* 0x.e08 - PCI/PCIE error interrupt enable register */
|
|
u8 res22[4];
|
|
__be32 pex_err_disr; /* 0x.e10 - PCI/PCIE error disable register */
|
|
u8 res23[12];
|
|
__be32 pex_err_cap_stat; /* 0x.e20 - PCI/PCIE error capture status register */
|
|
u8 res24[4];
|
|
__be32 pex_err_cap_r0; /* 0x.e28 - PCIE error capture register 0 */
|
|
__be32 pex_err_cap_r1; /* 0x.e2c - PCIE error capture register 0 */
|
|
__be32 pex_err_cap_r2; /* 0x.e30 - PCIE error capture register 0 */
|
|
__be32 pex_err_cap_r3; /* 0x.e34 - PCIE error capture register 0 */
|
|
u8 res_e38[200];
|
|
__be32 pdb_stat; /* 0x.f00 - PCIE Debug Status */
|
|
u8 res_f04[16];
|
|
__be32 pex_csr0; /* 0x.f14 - PEX Control/Status register 0*/
|
|
#define PEX_CSR0_LTSSM_MASK 0xFC
|
|
#define PEX_CSR0_LTSSM_SHIFT 2
|
|
#define PEX_CSR0_LTSSM_L0 0x11
|
|
__be32 pex_csr1; /* 0x.f18 - PEX Control/Status register 1*/
|
|
u8 res_f1c[228];
|
|
|
|
};
|
|
|
|
extern int fsl_add_bridge(struct platform_device *pdev, int is_primary);
|
|
extern void fsl_pcibios_fixup_bus(struct pci_bus *bus);
|
|
extern int mpc83xx_add_bridge(struct device_node *dev);
|
|
u64 fsl_pci_immrbar_base(struct pci_controller *hose);
|
|
|
|
extern struct device_node *fsl_pci_primary;
|
|
|
|
#ifdef CONFIG_PCI
|
|
void fsl_pci_assign_primary(void);
|
|
#else
|
|
static inline void fsl_pci_assign_primary(void) {}
|
|
#endif
|
|
|
|
#ifdef CONFIG_EDAC_MPC85XX
|
|
int mpc85xx_pci_err_probe(struct platform_device *op);
|
|
#else
|
|
static inline int mpc85xx_pci_err_probe(struct platform_device *op)
|
|
{
|
|
return -ENOTSUPP;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_FSL_PCI
|
|
extern int fsl_pci_mcheck_exception(struct pt_regs *);
|
|
#else
|
|
static inline int fsl_pci_mcheck_exception(struct pt_regs *regs) {return 0; }
|
|
#endif
|
|
|
|
#endif /* __POWERPC_FSL_PCI_H */
|
|
#endif /* __KERNEL__ */
|