| Message ID | 1437794486-21134-2-git-send-email-wangzhou1@hisilicon.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On 2015/7/25 11:21, Zhou Wang wrote: > From: Gabriele Paoloni <gabriele.paoloni@huawei.com> > > This patch is needed in order to unify the PCIe designware framework for ARM and > ARM64 architectures. In the PCIe designware unification process we are calling > pci_create_root_bus() passing a "sysdata" parameter that is the same for both > ARM and ARM64 and is of type "struct pcie_port*". In the ARM case this will > cause a problem with the function pcibios_align_resource(); in fact this will > cast "dev->sysdata" to "struct pci_sys_data*", whereas designware had passed a > "struct pcie_port*" pointer. > > This patch solves the issue by removing "align_resource" from "pci_sys_data" > struct and defining a static global function pointer in "bios32.c" > > Signed-off-by: Gabriele Paoloni <gabriele.paoloni@huawei.com> Hi Arnd and Rob, What is your opinion about this patch? Gabriele adds a global pointer in bios32.c to store align_resource, so we could remove sys->align_resource in pcibios_align_resource. As Lorenzo mentioned in v4 series, this is a temporary solution before moving align_resource to host bridge structure. Any comments welcome. Thanks, Zhou > --- > arch/arm/include/asm/mach/pci.h | 5 ----- > arch/arm/kernel/bios32.c | 12 ++++++++---- > 2 files changed, 8 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h > index 28b9bb3..8a4e4de 100644 > --- a/arch/arm/include/asm/mach/pci.h > +++ b/arch/arm/include/asm/mach/pci.h > @@ -58,11 +58,6 @@ struct pci_sys_data { > /* IRQ mapping */ > int (*map_irq)(const struct pci_dev *, u8, u8); > /* Resource alignement requirements */ > - resource_size_t (*align_resource)(struct pci_dev *dev, > - const struct resource *res, > - resource_size_t start, > - resource_size_t size, > - resource_size_t align); > void *private_data; /* platform controller private data */ > }; > > diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c > index fcbbbb1..4cdc64d 100644 > --- a/arch/arm/kernel/bios32.c > +++ b/arch/arm/kernel/bios32.c > @@ -17,6 +17,11 @@ > #include <asm/mach/pci.h> > > static int debug_pci; > +static resource_size_t (*align_resource)(struct pci_dev *dev, > + const struct resource *res, > + resource_size_t start, > + resource_size_t size, > + resource_size_t align) = NULL; > > #ifdef CONFIG_PCI_MSI > struct msi_controller *pcibios_msi_controller(struct pci_dev *dev) > @@ -468,7 +473,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, > sys->busnr = busnr; > sys->swizzle = hw->swizzle; > sys->map_irq = hw->map_irq; > - sys->align_resource = hw->align_resource; > + align_resource = hw->align_resource; > INIT_LIST_HEAD(&sys->resources); > > if (hw->private_data) > @@ -589,7 +594,6 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, > resource_size_t size, resource_size_t align) > { > struct pci_dev *dev = data; > - struct pci_sys_data *sys = dev->sysdata; > resource_size_t start = res->start; > > if (res->flags & IORESOURCE_IO && start & 0x300) > @@ -597,8 +601,8 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, > > start = (start + align - 1) & ~(align - 1); > > - if (sys->align_resource) > - return sys->align_resource(dev, res, start, size, align); > + if (align_resource) > + return align_resource(dev, res, start, size, align); > > return start; > } > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[CC'ing RMK] On Tue, Jul 28, 2015 at 08:17:18AM +0100, Zhou Wang wrote: > On 2015/7/25 11:21, Zhou Wang wrote: > > From: Gabriele Paoloni <gabriele.paoloni@huawei.com> > > > > This patch is needed in order to unify the PCIe designware framework for ARM and > > ARM64 architectures. In the PCIe designware unification process we are calling > > pci_create_root_bus() passing a "sysdata" parameter that is the same for both > > ARM and ARM64 and is of type "struct pcie_port*". In the ARM case this will > > cause a problem with the function pcibios_align_resource(); in fact this will > > cast "dev->sysdata" to "struct pci_sys_data*", whereas designware had passed a > > "struct pcie_port*" pointer. > > > > This patch solves the issue by removing "align_resource" from "pci_sys_data" > > struct and defining a static global function pointer in "bios32.c" > > > > Signed-off-by: Gabriele Paoloni <gabriele.paoloni@huawei.com> > > Hi Arnd and Rob, > > What is your opinion about this patch? Gabriele adds a global pointer in bios32.c > to store align_resource, so we could remove sys->align_resource in pcibios_align_resource. > > As Lorenzo mentioned in v4 series, this is a temporary solution before moving > align_resource to host bridge structure. > > Any comments welcome. The align_resource() pointer is just used in drivers/pci/host/pci-mvebu.c, I would like the pci-mvebu.c maintainers to comment on this and test it, I do not expect it to create any issue and might be a temporary solution to make progress on ARM/ARM64 consolidation, it is a blocking point. It would be good if Russell can have a look too, I do not see what issue this can trigger given that is just used in: drivers/pci/host/pci-mvebu.c and a global pointer (not saying it is elegant, but it should work) might be ok. So yes, comments very welcome. Thanks, Lorenzo > > Thanks, > Zhou > > > --- > > arch/arm/include/asm/mach/pci.h | 5 ----- > > arch/arm/kernel/bios32.c | 12 ++++++++---- > > 2 files changed, 8 insertions(+), 9 deletions(-) > > > > diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h > > index 28b9bb3..8a4e4de 100644 > > --- a/arch/arm/include/asm/mach/pci.h > > +++ b/arch/arm/include/asm/mach/pci.h > > @@ -58,11 +58,6 @@ struct pci_sys_data { > > /* IRQ mapping */ > > int (*map_irq)(const struct pci_dev *, u8, u8); > > /* Resource alignement requirements */ > > - resource_size_t (*align_resource)(struct pci_dev *dev, > > - const struct resource *res, > > - resource_size_t start, > > - resource_size_t size, > > - resource_size_t align); > > void *private_data; /* platform controller private data */ > > }; > > > > diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c > > index fcbbbb1..4cdc64d 100644 > > --- a/arch/arm/kernel/bios32.c > > +++ b/arch/arm/kernel/bios32.c > > @@ -17,6 +17,11 @@ > > #include <asm/mach/pci.h> > > > > static int debug_pci; > > +static resource_size_t (*align_resource)(struct pci_dev *dev, > > + const struct resource *res, > > + resource_size_t start, > > + resource_size_t size, > > + resource_size_t align) = NULL; > > > > #ifdef CONFIG_PCI_MSI > > struct msi_controller *pcibios_msi_controller(struct pci_dev *dev) > > @@ -468,7 +473,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, > > sys->busnr = busnr; > > sys->swizzle = hw->swizzle; > > sys->map_irq = hw->map_irq; > > - sys->align_resource = hw->align_resource; > > + align_resource = hw->align_resource; > > INIT_LIST_HEAD(&sys->resources); > > > > if (hw->private_data) > > @@ -589,7 +594,6 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, > > resource_size_t size, resource_size_t align) > > { > > struct pci_dev *dev = data; > > - struct pci_sys_data *sys = dev->sysdata; > > resource_size_t start = res->start; > > > > if (res->flags & IORESOURCE_IO && start & 0x300) > > @@ -597,8 +601,8 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, > > > > start = (start + align - 1) & ~(align - 1); > > > > - if (sys->align_resource) > > - return sys->align_resource(dev, res, start, size, align); > > + if (align_resource) > > + return align_resource(dev, res, start, size, align); > > > > return start; > > } > > > > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jul 28, 2015 at 12:44 PM, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> wrote: > [CC'ing RMK] > > On Tue, Jul 28, 2015 at 08:17:18AM +0100, Zhou Wang wrote: >> On 2015/7/25 11:21, Zhou Wang wrote: >> > From: Gabriele Paoloni <gabriele.paoloni@huawei.com> >> > >> > This patch is needed in order to unify the PCIe designware framework for ARM and >> > ARM64 architectures. In the PCIe designware unification process we are calling >> > pci_create_root_bus() passing a "sysdata" parameter that is the same for both >> > ARM and ARM64 and is of type "struct pcie_port*". In the ARM case this will >> > cause a problem with the function pcibios_align_resource(); in fact this will >> > cast "dev->sysdata" to "struct pci_sys_data*", whereas designware had passed a >> > "struct pcie_port*" pointer. >> > >> > This patch solves the issue by removing "align_resource" from "pci_sys_data" >> > struct and defining a static global function pointer in "bios32.c" >> > >> > Signed-off-by: Gabriele Paoloni <gabriele.paoloni@huawei.com> >> >> Hi Arnd and Rob, >> >> What is your opinion about this patch? Gabriele adds a global pointer in bios32.c >> to store align_resource, so we could remove sys->align_resource in pcibios_align_resource. >> >> As Lorenzo mentioned in v4 series, this is a temporary solution before moving >> align_resource to host bridge structure. >> >> Any comments welcome. > > The align_resource() pointer is just used in drivers/pci/host/pci-mvebu.c, > I would like the pci-mvebu.c maintainers to comment on this and test it, I > do not expect it to create any issue and might be a temporary solution to > make progress on ARM/ARM64 consolidation, it is a blocking point. > > It would be good if Russell can have a look too, I do not see what > issue this can trigger given that is just used in: It's Russell's call on this if you want to touch bios32.c... > > drivers/pci/host/pci-mvebu.c > > and a global pointer (not saying it is elegant, but it should work) > might be ok. > > So yes, comments very welcome. I may be wrong, but I don't think even mvebu needs this as part of pcibios_align_resource. pcibios_align_resource is called for every device, but all mvebu should care about is the alignment of the root bus BARs (and corresponding MBus windows) which can be handled in probe. I can't see how regions within there matter. But that is just my 10 minute look at it. If not, then I think align_resource should be a common per host function ptr. In other words, think about how to provide a default implementation of pcibios_align_resource. They almost all look the same to me with the same I/O 0x3xx address handling. Rob -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
SGkgUm9iLCBUaGFua3MgZm9yIHJldmlld2luZw0KDQo+IC0tLS0tT3JpZ2luYWwgTWVzc2FnZS0t LS0tDQo+IEZyb206IHJvYmhlcnJpbmcyQGdtYWlsLmNvbSBbbWFpbHRvOnJvYmhlcnJpbmcyQGdt YWlsLmNvbV0gT24gQmVoYWxmIE9mIFJvYg0KPiBIZXJyaW5nDQo+IFNlbnQ6IDMwIEp1bHkgMjAx NSAyMzo0OA0KPiBUbzogTG9yZW56byBQaWVyYWxpc2k7IFJ1c3NlbGwgS2luZyAtIEFSTSBMaW51 eDsgV2FuZ3pob3UgKEIpDQo+IENjOiBCam9ybiBIZWxnYWFzOyBKaW5nb28gSGFuOyBQcmF0eXVz aCBBbmFuZDsgQXJuZCBCZXJnbWFubjsgR2FicmllbGUgUGFvbG9uaTsNCj4gSmFtZXMgTW9yc2U7 IExpdml1IER1ZGF1OyB0aG9tYXMucGV0YXp6b25pQGZyZWUtZWxlY3Ryb25zLmNvbTsgSmFzb24g Q29vcGVyOw0KPiBsaW51eC1wY2lAdmdlci5rZXJuZWwub3JnOyBsaW51eC1hcm0ta2VybmVsQGxp c3RzLmluZnJhZGVhZC5vcmc7DQo+IGRldmljZXRyZWVAdmdlci5rZXJuZWwub3JnOyBZdWFuemhp Y2hhbmc7IFpodWRhY2FpOyB6aGFuZ2p1a3VvOyBxaXV6aGVuZmE7DQo+IGxpdWRvbmdkb25nIChD KTsgcWl1amlhbmc7IEthbmdmZW5nbG9uZzsgTGlndW96aHUgKEtlbm5ldGgpDQo+IFN1YmplY3Q6 IFJlOiBbUEFUQ0ggdjUgMS81XSBBUk0vUENJOiByZW1vdmUgYWxpZ25fcmVzb3VyY2UgaW4gcGNp X3N5c19kYXRhDQo+IA0KPiBPbiBUdWUsIEp1bCAyOCwgMjAxNSBhdCAxMjo0NCBQTSwgTG9yZW56 byBQaWVyYWxpc2kNCj4gPGxvcmVuem8ucGllcmFsaXNpQGFybS5jb20+IHdyb3RlOg0KPiA+IFtD QydpbmcgUk1LXQ0KPiA+DQo+ID4gT24gVHVlLCBKdWwgMjgsIDIwMTUgYXQgMDg6MTc6MThBTSAr MDEwMCwgWmhvdSBXYW5nIHdyb3RlOg0KPiA+PiBPbiAyMDE1LzcvMjUgMTE6MjEsIFpob3UgV2Fu ZyB3cm90ZToNCj4gPj4gPiBGcm9tOiBHYWJyaWVsZSBQYW9sb25pIDxnYWJyaWVsZS5wYW9sb25p QGh1YXdlaS5jb20+DQo+ID4+ID4NCj4gPj4gPiBUaGlzIHBhdGNoIGlzIG5lZWRlZCBpbiBvcmRl ciB0byB1bmlmeSB0aGUgUENJZSBkZXNpZ253YXJlIGZyYW1ld29yayBmb3INCj4gQVJNIGFuZA0K PiA+PiA+IEFSTTY0IGFyY2hpdGVjdHVyZXMuIEluIHRoZSBQQ0llIGRlc2lnbndhcmUgdW5pZmlj YXRpb24gcHJvY2VzcyB3ZSBhcmUNCj4gY2FsbGluZw0KPiA+PiA+IHBjaV9jcmVhdGVfcm9vdF9i dXMoKSBwYXNzaW5nIGEgInN5c2RhdGEiIHBhcmFtZXRlciB0aGF0IGlzIHRoZSBzYW1lIGZvcg0K PiBib3RoDQo+ID4+ID4gQVJNIGFuZCBBUk02NCBhbmQgaXMgb2YgdHlwZSAic3RydWN0IHBjaWVf cG9ydCoiLiBJbiB0aGUgQVJNIGNhc2UgdGhpcw0KPiB3aWxsDQo+ID4+ID4gY2F1c2UgYSBwcm9i bGVtIHdpdGggdGhlIGZ1bmN0aW9uIHBjaWJpb3NfYWxpZ25fcmVzb3VyY2UoKTsgaW4gZmFjdCB0 aGlzDQo+IHdpbGwNCj4gPj4gPiBjYXN0ICJkZXYtPnN5c2RhdGEiIHRvICJzdHJ1Y3QgcGNpX3N5 c19kYXRhKiIsIHdoZXJlYXMgZGVzaWdud2FyZSBoYWQNCj4gcGFzc2VkIGENCj4gPj4gPiAic3Ry dWN0IHBjaWVfcG9ydCoiIHBvaW50ZXIuDQo+ID4+ID4NCj4gPj4gPiBUaGlzIHBhdGNoIHNvbHZl cyB0aGUgaXNzdWUgYnkgcmVtb3ZpbmcgImFsaWduX3Jlc291cmNlIiBmcm9tDQo+ICJwY2lfc3lz X2RhdGEiDQo+ID4+ID4gc3RydWN0IGFuZCBkZWZpbmluZyBhIHN0YXRpYyBnbG9iYWwgZnVuY3Rp b24gcG9pbnRlciBpbiAiYmlvczMyLmMiDQo+ID4+ID4NCj4gPj4gPiBTaWduZWQtb2ZmLWJ5OiBH YWJyaWVsZSBQYW9sb25pIDxnYWJyaWVsZS5wYW9sb25pQGh1YXdlaS5jb20+DQo+ID4+DQo+ID4+ IEhpIEFybmQgYW5kIFJvYiwNCj4gPj4NCj4gPj4gV2hhdCBpcyB5b3VyIG9waW5pb24gYWJvdXQg dGhpcyBwYXRjaD8gR2FicmllbGUgYWRkcyBhIGdsb2JhbCBwb2ludGVyIGluDQo+IGJpb3MzMi5j DQo+ID4+IHRvIHN0b3JlIGFsaWduX3Jlc291cmNlLCBzbyB3ZSBjb3VsZCByZW1vdmUgc3lzLT5h bGlnbl9yZXNvdXJjZSBpbg0KPiBwY2liaW9zX2FsaWduX3Jlc291cmNlLg0KPiA+Pg0KPiA+PiBB cyBMb3JlbnpvIG1lbnRpb25lZCBpbiB2NCBzZXJpZXMsIHRoaXMgaXMgYSB0ZW1wb3Jhcnkgc29s dXRpb24gYmVmb3JlDQo+IG1vdmluZw0KPiA+PiBhbGlnbl9yZXNvdXJjZSB0byBob3N0IGJyaWRn ZSBzdHJ1Y3R1cmUuDQo+ID4+DQo+ID4+IEFueSBjb21tZW50cyB3ZWxjb21lLg0KPiA+DQo+ID4g VGhlIGFsaWduX3Jlc291cmNlKCkgcG9pbnRlciBpcyBqdXN0IHVzZWQgaW4gZHJpdmVycy9wY2kv aG9zdC9wY2ktbXZlYnUuYywNCj4gPiBJIHdvdWxkIGxpa2UgdGhlIHBjaS1tdmVidS5jIG1haW50 YWluZXJzIHRvIGNvbW1lbnQgb24gdGhpcyBhbmQgdGVzdCBpdCwgSQ0KPiA+IGRvIG5vdCBleHBl Y3QgaXQgdG8gY3JlYXRlIGFueSBpc3N1ZSBhbmQgbWlnaHQgYmUgYSB0ZW1wb3Jhcnkgc29sdXRp b24gdG8NCj4gPiBtYWtlIHByb2dyZXNzIG9uIEFSTS9BUk02NCBjb25zb2xpZGF0aW9uLCBpdCBp cyBhIGJsb2NraW5nIHBvaW50Lg0KPiA+DQo+ID4gSXQgd291bGQgYmUgZ29vZCBpZiBSdXNzZWxs IGNhbiBoYXZlIGEgbG9vayB0b28sIEkgZG8gbm90IHNlZSB3aGF0DQo+ID4gaXNzdWUgdGhpcyBj YW4gdHJpZ2dlciBnaXZlbiB0aGF0IGlzIGp1c3QgdXNlZCBpbjoNCj4gDQo+IEl0J3MgUnVzc2Vs bCdzIGNhbGwgb24gdGhpcyBpZiB5b3Ugd2FudCB0byB0b3VjaCBiaW9zMzIuYy4uLg0KPiANCj4g Pg0KPiA+IGRyaXZlcnMvcGNpL2hvc3QvcGNpLW12ZWJ1LmMNCj4gPg0KPiA+IGFuZCBhIGdsb2Jh bCBwb2ludGVyIChub3Qgc2F5aW5nIGl0IGlzIGVsZWdhbnQsIGJ1dCBpdCBzaG91bGQgd29yaykN Cj4gPiBtaWdodCBiZSBvay4NCj4gPg0KPiA+IFNvIHllcywgY29tbWVudHMgdmVyeSB3ZWxjb21l Lg0KPiANCj4gSSBtYXkgYmUgd3JvbmcsIGJ1dCBJIGRvbid0IHRoaW5rIGV2ZW4gbXZlYnUgbmVl ZHMgdGhpcyBhcyBwYXJ0IG9mDQo+IHBjaWJpb3NfYWxpZ25fcmVzb3VyY2UuIHBjaWJpb3NfYWxp Z25fcmVzb3VyY2UgaXMgY2FsbGVkIGZvciBldmVyeQ0KPiBkZXZpY2UsIGJ1dCBhbGwgbXZlYnUg c2hvdWxkIGNhcmUgYWJvdXQgaXMgdGhlIGFsaWdubWVudCBvZiB0aGUgcm9vdA0KPiBidXMgQkFS cyAoYW5kIGNvcnJlc3BvbmRpbmcgTUJ1cyB3aW5kb3dzKSB3aGljaCBjYW4gYmUgaGFuZGxlZCBp bg0KPiBwcm9iZS4gSSBjYW4ndCBzZWUgaG93IHJlZ2lvbnMgd2l0aGluIHRoZXJlIG1hdHRlci4g QnV0IHRoYXQgaXMganVzdA0KPiBteSAxMCBtaW51dGUgbG9vayBhdCBpdC4NCg0KSSB0aGluayBU aG9tYXMgUGV0YXp6b25pIHNob3VsZCBhbnN3ZXIgdGhpcy4uLnJpZ2h0PyAgDQoNCj4gDQo+IElm IG5vdCwgdGhlbiBJIHRoaW5rIGFsaWduX3Jlc291cmNlIHNob3VsZCBiZSBhIGNvbW1vbiBwZXIg aG9zdA0KPiBmdW5jdGlvbiBwdHIuIEluIG90aGVyIHdvcmRzLCB0aGluayBhYm91dCBob3cgdG8g cHJvdmlkZSBhIGRlZmF1bHQNCj4gaW1wbGVtZW50YXRpb24gb2YgcGNpYmlvc19hbGlnbl9yZXNv dXJjZS4gVGhleSBhbG1vc3QgYWxsIGxvb2sgdGhlDQo+IHNhbWUgdG8gbWUgd2l0aCB0aGUgc2Ft ZSBJL08gMHgzeHggYWRkcmVzcyBoYW5kbGluZy4NCg0KcGNpYmlvc19hbGlnbl9yZXNvdXJjZSBh bHJlYWR5IHByb3ZpZGVzIHRoZSBkZWZhdWx0IGFsaWdubWVudCBqb2IuDQpBcmUgeW91IHN1Z2dl c3RpbmcgdG8gcmVwbGFjZSBwY2liaW9zX2FsaWduX3Jlc291cmNlcyBpbXBsZW1lbnRhdGlvbg0K d2l0aCBhIHN0dWIgYW5kIG1vdmUgdGhlIGFsaWdubWVudCBqb2Igc29tZXdoZXJlIGVsc2UuLi4/ DQoNCj4gDQo+IFJvYg0K -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h index 28b9bb3..8a4e4de 100644 --- a/arch/arm/include/asm/mach/pci.h +++ b/arch/arm/include/asm/mach/pci.h @@ -58,11 +58,6 @@ struct pci_sys_data { /* IRQ mapping */ int (*map_irq)(const struct pci_dev *, u8, u8); /* Resource alignement requirements */ - resource_size_t (*align_resource)(struct pci_dev *dev, - const struct resource *res, - resource_size_t start, - resource_size_t size, - resource_size_t align); void *private_data; /* platform controller private data */ }; diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index fcbbbb1..4cdc64d 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c @@ -17,6 +17,11 @@ #include <asm/mach/pci.h> static int debug_pci; +static resource_size_t (*align_resource)(struct pci_dev *dev, + const struct resource *res, + resource_size_t start, + resource_size_t size, + resource_size_t align) = NULL; #ifdef CONFIG_PCI_MSI struct msi_controller *pcibios_msi_controller(struct pci_dev *dev) @@ -468,7 +473,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, sys->busnr = busnr; sys->swizzle = hw->swizzle; sys->map_irq = hw->map_irq; - sys->align_resource = hw->align_resource; + align_resource = hw->align_resource; INIT_LIST_HEAD(&sys->resources); if (hw->private_data) @@ -589,7 +594,6 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, resource_size_t size, resource_size_t align) { struct pci_dev *dev = data; - struct pci_sys_data *sys = dev->sysdata; resource_size_t start = res->start; if (res->flags & IORESOURCE_IO && start & 0x300) @@ -597,8 +601,8 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, start = (start + align - 1) & ~(align - 1); - if (sys->align_resource) - return sys->align_resource(dev, res, start, size, align); + if (align_resource) + return align_resource(dev, res, start, size, align); return start; }