Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tile PCI RC: support PCIe TRIO 0 MAC 0 on Gx72 system

On Tilera Gx72 systems, the logic for figuring out whether
a given port is root complex is slightly different.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>

+33 -3
+3
arch/tile/include/hv/drv_trio_intf.h
··· 168 168 struct pcie_trio_ports_property 169 169 { 170 170 struct pcie_port_property ports[TILEGX_TRIO_PCIES]; 171 + 172 + /** Set if this TRIO belongs to a Gx72 device. */ 173 + uint8_t is_gx72; 171 174 }; 172 175 173 176 /* Flags indicating traffic class. */
+30 -3
arch/tile/kernel/pci_gx.c
··· 436 436 437 437 /* 438 438 * Now determine which PCIe ports are configured to operate in RC 439 - * mode. To use a port, it must be allowed to be in RC mode by the 439 + * mode. There is a differece in the port configuration capability 440 + * between the Gx36 and Gx72 devices. 441 + * 442 + * The Gx36 has configuration capability for each of the 3 PCIe 443 + * interfaces (disable, auto endpoint, auto RC, etc.). 444 + * On the Gx72, you can only select one of the 3 PCIe interfaces per 445 + * TRIO to train automatically. Further, the allowable training modes 446 + * are reduced to four options (auto endpoint, auto RC, stream x1, 447 + * stream x4). 448 + * 449 + * For Gx36 ports, it must be allowed to be in RC mode by the 440 450 * Board Information Block, and the hardware strapping pins must be 441 451 * set to RC mode. 452 + * 453 + * For Gx72 ports, the port will operate in RC mode if either of the 454 + * following is true: 455 + * 1. It is allowed to be in RC mode by the Board Information Block, 456 + * and the BIB doesn't allow the EP mode. 457 + * 2. It is allowed to be in either the RC or the EP mode by the BIB, 458 + * and the hardware strapping pin is set to RC mode. 442 459 */ 443 460 for (i = 0; i < TILEGX_NUM_TRIO; i++) { 444 461 gxio_trio_context_t *context = &trio_contexts[i]; ··· 464 447 continue; 465 448 466 449 for (j = 0; j < TILEGX_TRIO_PCIES; j++) { 467 - if (pcie_ports[i].ports[j].allow_rc && 468 - strapped_for_rc(context, j)) { 450 + int is_rc = 0; 451 + 452 + if (pcie_ports[i].is_gx72 && 453 + pcie_ports[i].ports[j].allow_rc) { 454 + if (!pcie_ports[i].ports[j].allow_ep || 455 + strapped_for_rc(context, j)) 456 + is_rc = 1; 457 + } else if (pcie_ports[i].ports[j].allow_rc && 458 + strapped_for_rc(context, j)) { 459 + is_rc = 1; 460 + } 461 + if (is_rc) { 469 462 pcie_rc[i][j] = 1; 470 463 num_rc_controllers++; 471 464 }