Skip to contentSkip to conversation

PCI: define macro for marvell vendor ID

PATCH In review [email protected] 5 participants 5 messages Mar 7, 2013 – Mar 21, 2013 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 PCI: define macro for marvell vendor ID

From: Xiangliang Yu <[email protected]>

Define PCI_VENDOR_MARVELL_ID_EXT macro for 0x1b4b vendor ID

---
 include/linux/pci_ids.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
include/linux/pci_ids.h +1 -0
index f11c1c2..a80f9e6 100644
@@ -1604,6 +1604,7 @@
 #define PCI_SUBDEVICE_ID_KEYSPAN_SX2	0x5334
 
 #define PCI_VENDOR_ID_MARVELL		0x11ab
+#define PCI_VENDOR_ID_MARVELL_EXT	0x1b4b
 #define PCI_DEVICE_ID_MARVELL_GT64111	0x4146
 #define PCI_DEVICE_ID_MARVELL_GT64260	0x6430
 #define PCI_DEVICE_ID_MARVELL_MV64360	0x6460
Signature · 1 line
1.7.5.4
maintainer
#1 lore raw
Quoted 3 lines · On Thu, Mar 7, 2013 at 7:28 AM, <[email protected]> wrote:

From: Xiangliang Yu <[email protected]>

Define PCI_VENDOR_MARVELL_ID_EXT macro for 0x1b4b vendor ID

"PCI_VENDOR_MARVELL_ID_EXT" is not actually the symbol you defined below.

Per the comment at the top of pci_ids.h, we don't add things here unless they are shared between multiple drivers.

That said, the 0x1b4b vendor ID is used in mv_init.c, mvumi.h, mvumi.c, and ahci.c. If you want to unify all those so they all use same symbol, and define that symbol here in pci_ids.h, that would be fine with me.

Quoted 19 lines
---
 include/linux/pci_ids.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
include/linux/pci_ids.h +1 -1
index f11c1c2..a80f9e6 100644
@@ -1604,6 +1604,7 @@
 #define PCI_SUBDEVICE_ID_KEYSPAN_SX2   0x5334
 
 #define PCI_VENDOR_ID_MARVELL          0x11ab
+#define PCI_VENDOR_ID_MARVELL_EXT      0x1b4b
 #define PCI_DEVICE_ID_MARVELL_GT64111  0x4146
 #define PCI_DEVICE_ID_MARVELL_GT64260  0x6430
 #define PCI_DEVICE_ID_MARVELL_MV64360  0x6460
--

1.7.5.4

#2 lore raw

SGksIEJqb3JuDQpJIHdpbGwgdXBkYXRlIG12c2FzIGFuZCBhaGNpIHdpdGggdGhlIG1hY3JvLCBq dXN0IG5lZWQgbW9yZSB0aW1lIHRvIHRlc3QgaXQuDQpUaGFua3MhDQoNCj4gLS0tLS1PcmlnaW5h bCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogQmpvcm4gSGVsZ2FhcyBbbWFpbHRvOmJoZWxnYWFzQGdv b2dsZS5jb21dDQo+IFNlbnQ6IDIwMTPE6jPUwjjI1SAwOjI1DQo+IFRvOiB5eGxyYWlkQGdtYWls LmNvbQ0KPiBDYzogbGludXgtcGNpQHZnZXIua2VybmVsLm9yZzsgbGludXgta2VybmVsQHZnZXIu a2VybmVsLm9yZzsgWGlhbmdsaWFuZyBZdQ0KPiBTdWJqZWN0OiBSZTogW1BBVENIIDEvMl0gUENJ OiBkZWZpbmUgbWFjcm8gZm9yIG1hcnZlbGwgdmVuZG9yIElEDQo+IA0KPiBPbiBUaHUsIE1hciA3 LCAyMDEzIGF0IDc6MjggQU0sICA8eXhscmFpZEBnbWFpbC5jb20+IHdyb3RlOg0KPiA+IEZyb206 IFhpYW5nbGlhbmcgWXUgPHl1eGlhbmdsQG1hcnZlbGwuY29tPg0KPiA+DQo+ID4gRGVmaW5lIFBD SV9WRU5ET1JfTUFSVkVMTF9JRF9FWFQgbWFjcm8gZm9yIDB4MWI0YiB2ZW5kb3IgSUQNCj4gDQo+ ICJQQ0lfVkVORE9SX01BUlZFTExfSURfRVhUIiBpcyBub3QgYWN0dWFsbHkgdGhlIHN5bWJvbCB5 b3UgZGVmaW5lZCBiZWxvdy4NCj4gDQo+IFBlciB0aGUgY29tbWVudCBhdCB0aGUgdG9wIG9mIHBj aV9pZHMuaCwgd2UgZG9uJ3QgYWRkIHRoaW5ncyBoZXJlDQo+IHVubGVzcyB0aGV5IGFyZSBzaGFy ZWQgYmV0d2VlbiBtdWx0aXBsZSBkcml2ZXJzLg0KPiANCj4gVGhhdCBzYWlkLCB0aGUgMHgxYjRi IHZlbmRvciBJRCBpcyB1c2VkIGluIG12X2luaXQuYywgbXZ1bWkuaCwNCj4gbXZ1bWkuYywgYW5k IGFoY2kuYy4gIElmIHlvdSB3YW50IHRvIHVuaWZ5IGFsbCB0aG9zZSBzbyB0aGV5IGFsbCB1c2UN Cj4gc2FtZSBzeW1ib2wsIGFuZCBkZWZpbmUgdGhhdCBzeW1ib2wgaGVyZSBpbiBwY2lfaWRzLmgs IHRoYXQgd291bGQgYmUNCj4gZmluZSB3aXRoIG1lLg0KPiANCj4gPiAtLS0NCj4gPiAgaW5jbHVk ZS9saW51eC9wY2lfaWRzLmggfCAgICAxICsNCj4gPiAgMSBmaWxlcyBjaGFuZ2VkLCAxIGluc2Vy dGlvbnMoKyksIDAgZGVsZXRpb25zKC0pDQo+ID4NCj4gPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9s aW51eC9wY2lfaWRzLmggYi9pbmNsdWRlL2xpbnV4L3BjaV9pZHMuaA0KPiA+IGluZGV4IGYxMWMx YzIuLmE4MGY5ZTYgMTAwNjQ0DQo+ID4gLS0tIGEvaW5jbHVkZS9saW51eC9wY2lfaWRzLmgNCj4g PiArKysgYi9pbmNsdWRlL2xpbnV4L3BjaV9pZHMuaA0KPiA+IEBAIC0xNjA0LDYgKzE2MDQsNyBA QA0KPiA+ICAjZGVmaW5lIFBDSV9TVUJERVZJQ0VfSURfS0VZU1BBTl9TWDIgICAweDUzMzQNCj4g Pg0KPiA+ICAjZGVmaW5lIFBDSV9WRU5ET1JfSURfTUFSVkVMTCAgICAgICAgICAweDExYWINCj4g PiArI2RlZmluZSBQQ0lfVkVORE9SX0lEX01BUlZFTExfRVhUICAgICAgMHgxYjRiDQo+ID4gICNk ZWZpbmUgUENJX0RFVklDRV9JRF9NQVJWRUxMX0dUNjQxMTEgIDB4NDE0Ng0KPiA+ICAjZGVmaW5l IFBDSV9ERVZJQ0VfSURfTUFSVkVMTF9HVDY0MjYwICAweDY0MzANCj4gPiAgI2RlZmluZSBQQ0lf REVWSUNFX0lEX01BUlZFTExfTVY2NDM2MCAgMHg2NDYwDQo+ID4gLS0NCj4gPiAxLjcuNS40DQo+ ID4NCg==

#3 lore raw
In reply to Bjorn Helgaas
Quoted 7 lines · Bjorn Helgaas
Quoted 3 lines · On Thu, Mar 7, 2013 at 7:28 AM, <[email protected]> wrote:

From: Xiangliang Yu <[email protected]>

Define PCI_VENDOR_MARVELL_ID_EXT macro for 0x1b4b vendor ID

"PCI_VENDOR_MARVELL_ID_EXT" is not actually the symbol you defined below.

Quoted 8 lines

Per the comment at the top of pci_ids.h, we don't add things here unless they are shared between multiple drivers.

That said, the 0x1b4b vendor ID is used in mv_init.c, mvumi.h, mvumi.c, and ahci.c. If you want to unify all those so they all use same symbol, and define that symbol here in pci_ids.h, that would be fine with me.

This symbol will also be useful for the quirk that creates iommu context entries for Marvell devices that use incorrect dma source tags. I'll update and resend that patch when this change has been merged.

Thanks
Andrew

#4 lore raw
Quoted 17 lines · Andrew Cooks
Quoted 7 lines · Bjorn Helgaas
Quoted 3 lines · On Thu, Mar 7, 2013 at 7:28 AM, <[email protected]> wrote:

From: Xiangliang Yu <[email protected]>

Define PCI_VENDOR_MARVELL_ID_EXT macro for 0x1b4b vendor ID

"PCI_VENDOR_MARVELL_ID_EXT" is not actually the symbol you defined below.

Quoted 8 lines

Per the comment at the top of pci_ids.h, we don't add things here unless they are shared between multiple drivers.

That said, the 0x1b4b vendor ID is used in mv_init.c, mvumi.h, mvumi.c, and ahci.c. If you want to unify all those so they all use same symbol, and define that symbol here in pci_ids.h, that would be fine with me.

Quoted 4 lines

This symbol will also be useful for the quirk that creates iommu context entries for Marvell devices that use incorrect dma source tags. I'll update and resend that patch when this change has been merged.

Andrew -
A new series that includes the 0x1b4b vendor ID change was posted
last night so you may want to follow that:
https://lkml.org/lkml/2013/3/21/12

Quoted 7 lines

Thanks
Andrew
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html