Re: [PATCH] pseries: asm/pci-bridge.h CONFIG_ minor cleanup
From: Michael Ellerman <hidden>
Date: 2007-05-22 00:40:59
On Mon, 2007-05-21 at 18:18 -0500, Linas Vepstas wrote:
quoted hunk ↗ jump to hunk
Use the correct CONFIG_ option to mark off the EEH bits. Move the EEH bits to the bottom of the struct. Signed-off-by: Linas Vepstas <redacted> ---- include/asm-powerpc/pci-bridge.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) Index: linux-2.6.22-rc1/include/asm-powerpc/pci-bridge.h ===================================================================--- linux-2.6.22-rc1.orig/include/asm-powerpc/pci-bridge.h 2007-05-21 18:13:00.000000000 -0500 +++ linux-2.6.22-rc1/include/asm-powerpc/pci-bridge.h 2007-05-21 18:13:36.000000000 -0500@@ -70,19 +70,20 @@ struct pci_dn { int devfn; /* pci device and function number */ int class_code; /* pci device class */ -#ifdef CONFIG_PPC_PSERIES - int eeh_mode; /* See eeh.h for possible EEH_MODEs */ - int eeh_config_addr; - int eeh_pe_config_addr; /* new-style partition endpoint address */ - int eeh_check_count; /* # times driver ignored error */ - int eeh_freeze_count; /* # times this device froze up. */ -#endif
You're making the struct 4 bytes larger by creating a hole here :(
int pci_ext_config_space; /* for pci devices */ struct pci_controller *phb; /* for pci devices */ struct iommu_table *iommu_table; /* for phb's or bridges */ struct pci_dev *pcidev; /* back-pointer to the pci device */ struct device_node *node; /* back-pointer to the device_node */ + +#ifdef CONFIG_EEH + int eeh_mode; /* See eeh.h for possible EEH_MODEs */ + int eeh_config_addr; + int eeh_pe_config_addr; /* new-style partition endpoint address */ + int eeh_check_count; /* # times driver ignored error */ + int eeh_freeze_count; /* # times this device froze up. */ u32 config_space[16]; /* saved PCI config space */ +#endif
It looks correct, but I think it's worth mentioning in the changelog that config_space was previously unconditionally defined, but is now within CONFIG_EEH. cheers -- Michael Ellerman OzLabs, IBM Australia Development Lab wwweb: http://michael.ellerman.id.au phone: +61 2 6212 1183 (tie line 70 21183) We do not inherit the earth from our ancestors, we borrow it from our children. - S.M.A.R.T Person
Attachments
- signature.asc [application/pgp-signature] 189 bytes