Commit 54f98a8b authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/switchtec' 

- Add Gen4 automotive device IDs (Kelvin Cao)

- Declare state_names[] as static so it's not allocated and initialized for
  every call (Kelvin Cao)

* pci/switchtec:
  PCI/switchtec: Declare local state_names[] as static
  PCI/switchtec: Add Gen4 automotive device IDs
parents 05642e2f b76521f6

drivers/pci/quirks.c

+9 −0
Original line number Diff line number Diff line
@@ -5683,6 +5683,15 @@ SWITCHTEC_QUIRK(0x4268); /* PAX 68XG4 */ 
SWITCHTEC_QUIRK(0x4252);  /* PAX 52XG4  */

SWITCHTEC_QUIRK(0x4236);  /* PAX 36XG4  */

SWITCHTEC_QUIRK(0x4228);  /* PAX 28XG4  */

SWITCHTEC_QUIRK(0x4352);  /* PFXA 52XG4 */

SWITCHTEC_QUIRK(0x4336);  /* PFXA 36XG4 */

SWITCHTEC_QUIRK(0x4328);  /* PFXA 28XG4 */

SWITCHTEC_QUIRK(0x4452);  /* PSXA 52XG4 */

SWITCHTEC_QUIRK(0x4436);  /* PSXA 36XG4 */

SWITCHTEC_QUIRK(0x4428);  /* PSXA 28XG4 */

SWITCHTEC_QUIRK(0x4552);  /* PAXA 52XG4 */

SWITCHTEC_QUIRK(0x4536);  /* PAXA 36XG4 */

SWITCHTEC_QUIRK(0x4528);  /* PAXA 28XG4 */



/*

 * The PLX NTB uses devfn proxy IDs to move TLPs between NT endpoints.

drivers/pci/switch/switchtec.c

+10 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void stuser_set_state(struct switchtec_user *stuser, 
{

	/* requires the mrpc_mutex to already be held when called */



	const char * const state_names[] = {

	static const char * const state_names[] = {

		[MRPC_IDLE] = "IDLE",

		[MRPC_QUEUED] = "QUEUED",

		[MRPC_RUNNING] = "RUNNING",
@@ -1779,6 +1779,15 @@ static const struct pci_device_id switchtec_pci_tbl[] = { 
	SWITCHTEC_PCI_DEVICE(0x4252, SWITCHTEC_GEN4),  //PAX 52XG4

	SWITCHTEC_PCI_DEVICE(0x4236, SWITCHTEC_GEN4),  //PAX 36XG4

	SWITCHTEC_PCI_DEVICE(0x4228, SWITCHTEC_GEN4),  //PAX 28XG4

	SWITCHTEC_PCI_DEVICE(0x4352, SWITCHTEC_GEN4),  //PFXA 52XG4

	SWITCHTEC_PCI_DEVICE(0x4336, SWITCHTEC_GEN4),  //PFXA 36XG4

	SWITCHTEC_PCI_DEVICE(0x4328, SWITCHTEC_GEN4),  //PFXA 28XG4

	SWITCHTEC_PCI_DEVICE(0x4452, SWITCHTEC_GEN4),  //PSXA 52XG4

	SWITCHTEC_PCI_DEVICE(0x4436, SWITCHTEC_GEN4),  //PSXA 36XG4

	SWITCHTEC_PCI_DEVICE(0x4428, SWITCHTEC_GEN4),  //PSXA 28XG4

	SWITCHTEC_PCI_DEVICE(0x4552, SWITCHTEC_GEN4),  //PAXA 52XG4

	SWITCHTEC_PCI_DEVICE(0x4536, SWITCHTEC_GEN4),  //PAXA 36XG4

	SWITCHTEC_PCI_DEVICE(0x4528, SWITCHTEC_GEN4),  //PAXA 28XG4

	{0}

};

MODULE_DEVICE_TABLE(pci, switchtec_pci_tbl);