Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / arch / powerpc / include / asm / eeh.h

diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h
index 867c39b..fb9f376 100644 (file)
--- a/arch/powerpc/include/asm/eeh.h
+++ b/arch/powerpc/include/asm/eeh.h
@@ -72,6 +72,7 @@ struct pci_dn;
 #define EEH_PE_PHB     (1 << 1)        /* PHB PE    */
 #define EEH_PE_DEVICE  (1 << 2)        /* Device PE */
 #define EEH_PE_BUS     (1 << 3)        /* Bus PE    */
+#define EEH_PE_VF      (1 << 4)        /* VF PE     */
 
 #define EEH_PE_ISOLATED                (1 << 0)        /* Isolated PE          */
 #define EEH_PE_RECOVERING      (1 << 1)        /* Recovering PE        */
@@ -136,11 +137,15 @@ struct eeh_dev {
        int pcix_cap;                   /* Saved PCIx capability        */
        int pcie_cap;                   /* Saved PCIe capability        */
        int aer_cap;                    /* Saved AER capability         */
+       int af_cap;                     /* Saved AF capability          */
        struct eeh_pe *pe;              /* Associated PE                */
        struct list_head list;          /* Form link list in the PE     */
+       struct list_head rmv_list;      /* Record the removed edevs     */
        struct pci_controller *phb;     /* Associated PHB               */
        struct pci_dn *pdn;             /* Associated PCI device node   */
        struct pci_dev *pdev;           /* Associated PCI device        */
+       bool in_error;                  /* Error flag for edev          */
+       struct pci_dev *physfn;         /* Associated SRIOV PF          */
        struct pci_bus *bus;            /* PCI bus for partial hotplug  */
 };