| Message ID | 1474506346-20873-1-git-send-email-shhuiw@foxmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Sep 22, 2016 at 09:05:46AM +0800, Wang Sheng-Hui wrote: > This is a cleanup that moves PCI configuration space size > macros (PCI_CFG_SPACE_SIZE and PCI_CFG_SPACE_EXP_SIZE) from > drivers/pci/pci.h to include/uapi/linux/pci_regs.h > > So that the macros can be used by more drivers and eliminate > potential duplicate definition. > > Signed-off-by: Wang Sheng-Hui <shhuiw@foxmail.com> Applied to pci/misc for v4.10, thanks! I updated the comment to include PCI-X details, since the extended config space applies to PCI-X Mode 2 devices as well as to PCIe devices: + * Conventional PCI and PCI-X Mode 1 devices have 256 bytes of + * configuration space. PCI-X Mode 2 and PCIe devices have 4096 bytes of + * configuration space. > --- > drivers/pci/pci.h | 3 --- > drivers/vfio/pci/vfio_pci_config.c | 2 -- > include/uapi/linux/pci_regs.h | 7 +++++++ > 3 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h > index 9730c47..12d651a 100644 > --- a/drivers/pci/pci.h > +++ b/drivers/pci/pci.h > @@ -1,9 +1,6 @@ > #ifndef DRIVERS_PCI_H > #define DRIVERS_PCI_H > > -#define PCI_CFG_SPACE_SIZE 256 > -#define PCI_CFG_SPACE_EXP_SIZE 4096 > - > #define PCI_FIND_CAP_TTL 48 > > extern const unsigned char pcie_link_speed[]; > diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c > index 688691d..8dc8a5a 100644 > --- a/drivers/vfio/pci/vfio_pci_config.c > +++ b/drivers/vfio/pci/vfio_pci_config.c > @@ -31,8 +31,6 @@ > > #include "vfio_pci_private.h" > > -#define PCI_CFG_SPACE_SIZE 256 > - > /* Fake capability ID for standard config space */ > #define PCI_CAP_ID_BASIC 0 > > diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h > index 4040951..a07c53c 100644 > --- a/include/uapi/linux/pci_regs.h > +++ b/include/uapi/linux/pci_regs.h > @@ -23,6 +23,13 @@ > #define LINUX_PCI_REGS_H > > /* > + * Under PCI, each device has 256 bytes of configuration address space. > + * Under PCIe, each device has 4096 bytes of configuration address space. > + */ > +#define PCI_CFG_SPACE_SIZE 256 > +#define PCI_CFG_SPACE_EXP_SIZE 4096 > + > +/* > * Under PCI, each device has 256 bytes of configuration address space, > * of which the first 64 bytes are standardized as follows: > */ > -- > 2.7.4 > > > > -- > 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 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
VGhhbmtzIQoKUmVnYXJkcywKV2FuZyBTaGVuZy1IdWkKCgotLS0tLS0tLS0tLS0tLS0tLS0g T3JpZ2luYWwgLS0tLS0tLS0tLS0tLS0tLS0tCkZyb206ICAiQmpvcm4gSGVsZ2FhcyI7PGhl bGdhYXNAa2VybmVsLm9yZz47CkRhdGU6ICBTYXQsIE5vdiAxMiwgMjAxNiAwNDo1MSBBTQpU bzogICJXYW5nIFNoZW5nLUh1aSI8c2hodWl3QGZveG1haWwuY29tPjsgCkNjOiAgInl1Lnpo YW8iPHl1LnpoYW9AaW50ZWwuY29tPjsgImpiYXJuZXMiPGpiYXJuZXNAdmlydHVvdXNnZWVr Lm9yZz47ICJhbGV4LndpbGxpYW1zb24iPGFsZXgud2lsbGlhbXNvbkByZWRoYXQuY29tPjsg ImJoZWxnYWFzIjxiaGVsZ2Fhc0Bnb29nbGUuY29tPjsgImxpbnV4LXBjaSI8bGludXgtcGNp QHZnZXIua2VybmVsLm9yZz47ICJrdm0iPGt2bUB2Z2VyLmtlcm5lbC5vcmc+OyAibGludXgt a2VybmVsIjxsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnPjsgClN1YmplY3Q6ICBSZTog W1BBVENIXSBQQ0k6IG1vdmUgY2ZnIHNwYWNlIHNpemUgKDI1Ni80MDk2KSBtYWNyb3MgdG8g cGNpX3JlZ3MuaAoKCgpPbiBUaHUsIFNlcCAyMiwgMjAxNiBhdCAwOTowNTo0NkFNICswODAw LCBXYW5nIFNoZW5nLUh1aSB3cm90ZToKPiBUaGlzIGlzIGEgY2xlYW51cCB0aGF0IG1vdmVz IFBDSSBjb25maWd1cmF0aW9uIHNwYWNlIHNpemUKPiBtYWNyb3MgKFBDSV9DRkdfU1BBQ0Vf U0laRSBhbmQgUENJX0NGR19TUEFDRV9FWFBfU0laRSkgZnJvbQo+IGRyaXZlcnMvcGNpL3Bj aS5oIHRvIGluY2x1ZGUvdWFwaS9saW51eC9wY2lfcmVncy5oCj4gCj4gU28gdGhhdCB0aGUg bWFjcm9zIGNhbiBiZSB1c2VkIGJ5IG1vcmUgZHJpdmVycyBhbmQgZWxpbWluYXRlCj4gcG90 ZW50aWFsIGR1cGxpY2F0ZSBkZWZpbml0aW9uLgo+IAo+IFNpZ25lZC1vZmYtYnk6IFdhbmcg U2hlbmctSHVpIDxzaGh1aXdAZm94bWFpbC5jb20+CgpBcHBsaWVkIHRvIHBjaS9taXNjIGZv ciB2NC4xMCwgdGhhbmtzIQoKSSB1cGRhdGVkIHRoZSBjb21tZW50IHRvIGluY2x1ZGUgUENJ LVggZGV0YWlscywgc2luY2UgdGhlIGV4dGVuZGVkIGNvbmZpZwpzcGFjZSBhcHBsaWVzIHRv IFBDSS1YIE1vZGUgMiBkZXZpY2VzIGFzIHdlbGwgYXMgdG8gUENJZSBkZXZpY2VzOgoKKyAq IENvbnZlbnRpb25hbCBQQ0kgYW5kIFBDSS1YIE1vZGUgMSBkZXZpY2VzIGhhdmUgMjU2IGJ5 dGVzIG9mCisgKiBjb25maWd1cmF0aW9uIHNwYWNlLiAgUENJLVggTW9kZSAyIGFuZCBQQ0ll IGRldmljZXMgaGF2ZSA0MDk2IGJ5dGVzIG9mCisgKiBjb25maWd1cmF0aW9uIHNwYWNlLgoK PiAtLS0KPiAgZHJpdmVycy9wY2kvcGNpLmggICAgICAgICAgICAgICAgICB8IDMgLS0tCj4g IGRyaXZlcnMvdmZpby9wY2kvdmZpb19wY2lfY29uZmlnLmMgfCAyIC0tCj4gIGluY2x1ZGUv dWFwaS9saW51eC9wY2lfcmVncy5oICAgICAgfCA3ICsrKysrKysKPiAgMyBmaWxlcyBjaGFu Z2VkLCA3IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBh L2RyaXZlcnMvcGNpL3BjaS5oIGIvZHJpdmVycy9wY2kvcGNpLmgKPiBpbmRleCA5NzMwYzQ3 Li4xMmQ2NTFhIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvcGNpL3BjaS5oCj4gKysrIGIvZHJp dmVycy9wY2kvcGNpLmgKPiBAQCAtMSw5ICsxLDYgQEAKPiAgI2lmbmRlZiBEUklWRVJTX1BD SV9ICj4gICNkZWZpbmUgRFJJVkVSU19QQ0lfSAo+ICAKPiAtI2RlZmluZSBQQ0lfQ0ZHX1NQ QUNFX1NJWkUgMjU2Cj4gLSNkZWZpbmUgUENJX0NGR19TUEFDRV9FWFBfU0laRSA0MDk2Cj4g LQo+ICAjZGVmaW5lIFBDSV9GSU5EX0NBUF9UVEwgNDgKPiAgCj4gIGV4dGVybiBjb25zdCB1 bnNpZ25lZCBjaGFyIHBjaWVfbGlua19zcGVlZFtdOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L3ZmaW8vcGNpL3ZmaW9fcGNpX2NvbmZpZy5jIGIvZHJpdmVycy92ZmlvL3BjaS92ZmlvX3Bj aV9jb25maWcuYwo+IGluZGV4IDY4ODY5MWQuLjhkYzhhNWEgMTAwNjQ0Cj4gLS0tIGEvZHJp dmVycy92ZmlvL3BjaS92ZmlvX3BjaV9jb25maWcuYwo+ICsrKyBiL2RyaXZlcnMvdmZpby9w Y2kvdmZpb19wY2lfY29uZmlnLmMKPiBAQCAtMzEsOCArMzEsNiBAQAo+ICAKPiAgI2luY2x1 ZGUgInZmaW9fcGNpX3ByaXZhdGUuaCIKPiAgCj4gLSNkZWZpbmUgUENJX0NGR19TUEFDRV9T SVpFIDI1Ngo+IC0KPiAgLyogRmFrZSBjYXBhYmlsaXR5IElEIGZvciBzdGFuZGFyZCBjb25m aWcgc3BhY2UgKi8KPiAgI2RlZmluZSBQQ0lfQ0FQX0lEX0JBU0lDIDAKPiAgCj4gZGlmZiAt LWdpdCBhL2luY2x1ZGUvdWFwaS9saW51eC9wY2lfcmVncy5oIGIvaW5jbHVkZS91YXBpL2xp bnV4L3BjaV9yZWdzLmgKPiBpbmRleCA0MDQwOTUxLi5hMDdjNTNjIDEwMDY0NAo+IC0tLSBh L2luY2x1ZGUvdWFwaS9saW51eC9wY2lfcmVncy5oCj4gKysrIGIvaW5jbHVkZS91YXBpL2xp bnV4L3BjaV9yZWdzLmgKPiBAQCAtMjMsNiArMjMsMTMgQEAKPiAgI2RlZmluZSBMSU5VWF9Q Q0lfUkVHU19ICj4gIAo+ICAvKgo+ICsgKiBVbmRlciBQQ0ksIGVhY2ggZGV2aWNlIGhhcyAy NTYgYnl0ZXMgb2YgY29uZmlndXJhdGlvbiBhZGRyZXNzIHNwYWNlLgo+ICsgKiBVbmRlciBQ Q0llLCBlYWNoIGRldmljZSBoYXMgNDA5NiBieXRlcyBvZiBjb25maWd1cmF0aW9uIGFkZHJl c3Mgc3BhY2UuCj4gKyAqLwo+ICsjZGVmaW5lIFBDSV9DRkdfU1BBQ0VfU0laRSAyNTYKPiAr I2RlZmluZSBQQ0lfQ0ZHX1NQQUNFX0VYUF9TSVpFIDQwOTYKPiArCj4gKy8qCj4gICAqIFVu ZGVyIFBDSSwgZWFjaCBkZXZpY2UgaGFzIDI1NiBieXRlcyBvZiBjb25maWd1cmF0aW9uIGFk ZHJlc3Mgc3BhY2UsCj4gICAqIG9mIHdoaWNoIHRoZSBmaXJzdCA2NCBieXRlcyBhcmUgc3Rh bmRhcmRpemVkIGFzIGZvbGxvd3M6Cj4gICAqLwo+IC0tIAo+IDIuNy40Cj4gCj4gCj4gCj4g LS0KPiBUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5z dWJzY3JpYmUgbGludXgtcGNpIiBpbgo+IHRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpv cmRvbW9Admdlci5rZXJuZWwub3JnCj4gTW9yZSBtYWpvcmRvbW8gaW5mbyBhdCAgaHR0cDov L3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1s -- To unsubscribe from this list: send the line "unsubscribe kvm" 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/drivers/pci/pci.h b/drivers/pci/pci.h index 9730c47..12d651a 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -1,9 +1,6 @@ #ifndef DRIVERS_PCI_H #define DRIVERS_PCI_H -#define PCI_CFG_SPACE_SIZE 256 -#define PCI_CFG_SPACE_EXP_SIZE 4096 - #define PCI_FIND_CAP_TTL 48 extern const unsigned char pcie_link_speed[]; diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c index 688691d..8dc8a5a 100644 --- a/drivers/vfio/pci/vfio_pci_config.c +++ b/drivers/vfio/pci/vfio_pci_config.c @@ -31,8 +31,6 @@ #include "vfio_pci_private.h" -#define PCI_CFG_SPACE_SIZE 256 - /* Fake capability ID for standard config space */ #define PCI_CAP_ID_BASIC 0 diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index 4040951..a07c53c 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -23,6 +23,13 @@ #define LINUX_PCI_REGS_H /* + * Under PCI, each device has 256 bytes of configuration address space. + * Under PCIe, each device has 4096 bytes of configuration address space. + */ +#define PCI_CFG_SPACE_SIZE 256 +#define PCI_CFG_SPACE_EXP_SIZE 4096 + +/* * Under PCI, each device has 256 bytes of configuration address space, * of which the first 64 bytes are standardized as follows: */
This is a cleanup that moves PCI configuration space size macros (PCI_CFG_SPACE_SIZE and PCI_CFG_SPACE_EXP_SIZE) from drivers/pci/pci.h to include/uapi/linux/pci_regs.h So that the macros can be used by more drivers and eliminate potential duplicate definition. Signed-off-by: Wang Sheng-Hui <shhuiw@foxmail.com> --- drivers/pci/pci.h | 3 --- drivers/vfio/pci/vfio_pci_config.c | 2 -- include/uapi/linux/pci_regs.h | 7 +++++++ 3 files changed, 7 insertions(+), 5 deletions(-)