Commit 3c0553e7 authored by Jayachandran C's avatar Jayachandran C Committed by Ralf Baechle
Browse files

MIPS: Netlogic: Avoid using fixed PIC IRT index 



The index for a device interrupt in the PIC interrupt routing table
changes for different chips in the XLP family.  Avoid using the fixed
entries and derive the index value from the SoC device header.

Add workarounds for some devices which do not report the IRT index
correctly.

Signed-off-by: default avatarJayachandran C <jchandra@broadcom.com>
Patchwork: http://patchwork.linux-mips.org/patch/5025/


Acked-by: default avatarJohn Crispin <blogic@openwrt.org>
parent 62b734d2

arch/mips/include/asm/netlogic/xlp-hal/pic.h

+0 −53
Original line number Diff line number Diff line
@@ -191,59 +191,6 @@ 
#define PIC_IRT_PCIE_LINK_2_INDEX	80

#define PIC_IRT_PCIE_LINK_3_INDEX	81

#define PIC_IRT_PCIE_LINK_INDEX(num)	((num) + PIC_IRT_PCIE_LINK_0_INDEX)

/* 78 to 81 */

#define PIC_NUM_NA_IRTS			32

/* 82 to 113 */

#define PIC_IRT_NA_0_INDEX		82

#define PIC_IRT_NA_INDEX(num)		((num) + PIC_IRT_NA_0_INDEX)

#define PIC_IRT_POE_INDEX		114



#define PIC_NUM_USB_IRTS		6

#define PIC_IRT_USB_0_INDEX		115

#define PIC_IRT_EHCI_0_INDEX		115

#define PIC_IRT_OHCI_0_INDEX		116

#define PIC_IRT_OHCI_1_INDEX		117

#define PIC_IRT_EHCI_1_INDEX		118

#define PIC_IRT_OHCI_2_INDEX		119

#define PIC_IRT_OHCI_3_INDEX		120

#define PIC_IRT_USB_INDEX(num)		((num) + PIC_IRT_USB_0_INDEX)

/* 115 to 120 */

#define PIC_IRT_GDX_INDEX		121

#define PIC_IRT_SEC_INDEX		122

#define PIC_IRT_RSA_INDEX		123



#define PIC_NUM_COMP_IRTS		4

#define PIC_IRT_COMP_0_INDEX		124

#define PIC_IRT_COMP_INDEX(num)		((num) + PIC_IRT_COMP_0_INDEX)

/* 124 to 127 */

#define PIC_IRT_GBU_INDEX		128

#define PIC_IRT_ICC_0_INDEX		129 /* ICC - Inter Chip Coherency */

#define PIC_IRT_ICC_1_INDEX		130

#define PIC_IRT_ICC_2_INDEX		131

#define PIC_IRT_CAM_INDEX		132

#define PIC_IRT_UART_0_INDEX		133

#define PIC_IRT_UART_1_INDEX		134

#define PIC_IRT_I2C_0_INDEX		135

#define PIC_IRT_I2C_1_INDEX		136

#define PIC_IRT_SYS_0_INDEX		137

#define PIC_IRT_SYS_1_INDEX		138

#define PIC_IRT_JTAG_INDEX		139

#define PIC_IRT_PIC_INDEX		140

#define PIC_IRT_NBU_INDEX		141

#define PIC_IRT_TCU_INDEX		142

#define PIC_IRT_GCU_INDEX		143 /* GBC - Global Coherency */

#define PIC_IRT_DMC_0_INDEX		144

#define PIC_IRT_DMC_1_INDEX		145



#define PIC_NUM_GPIO_IRTS		4

#define PIC_IRT_GPIO_0_INDEX		146

#define PIC_IRT_GPIO_INDEX(num)		((num) + PIC_IRT_GPIO_0_INDEX)



/* 146 to 149 */

#define PIC_IRT_NOR_INDEX		150

#define PIC_IRT_NAND_INDEX		151

#define PIC_IRT_SPI_INDEX		152

#define PIC_IRT_MMC_INDEX		153



#define PIC_CLOCK_TIMER			7

#define PIC_IRQ_BASE			8

arch/mips/netlogic/xlp/nlm_hal.c

+40 −22
Original line number Diff line number Diff line
@@ -61,43 +61,61 @@ void nlm_node_init(int node) 


int nlm_irq_to_irt(int irq)

{

	if (!PIC_IRQ_IS_IRT(irq))

		return -1;

	uint64_t pcibase;

	int devoff, irt;



	switch (irq) {

	case PIC_UART_0_IRQ:

		return PIC_IRT_UART_0_INDEX;

		devoff = XLP_IO_UART0_OFFSET(0);

		break;

	case PIC_UART_1_IRQ:

		return PIC_IRT_UART_1_INDEX;

	case PIC_PCIE_LINK_0_IRQ:

	       return PIC_IRT_PCIE_LINK_0_INDEX;

	case PIC_PCIE_LINK_1_IRQ:

	       return PIC_IRT_PCIE_LINK_1_INDEX;

	case PIC_PCIE_LINK_2_IRQ:

	       return PIC_IRT_PCIE_LINK_2_INDEX;

	case PIC_PCIE_LINK_3_IRQ:

	       return PIC_IRT_PCIE_LINK_3_INDEX;

		devoff = XLP_IO_UART1_OFFSET(0);

		break;

	case PIC_EHCI_0_IRQ:

	       return PIC_IRT_EHCI_0_INDEX;

		devoff = XLP_IO_USB_EHCI0_OFFSET(0);

		break;

	case PIC_EHCI_1_IRQ:

	       return PIC_IRT_EHCI_1_INDEX;

		devoff = XLP_IO_USB_EHCI1_OFFSET(0);

		break;

	case PIC_OHCI_0_IRQ:

	       return PIC_IRT_OHCI_0_INDEX;

		devoff = XLP_IO_USB_OHCI0_OFFSET(0);

		break;

	case PIC_OHCI_1_IRQ:

	       return PIC_IRT_OHCI_1_INDEX;

		devoff = XLP_IO_USB_OHCI1_OFFSET(0);

		break;

	case PIC_OHCI_2_IRQ:

	       return PIC_IRT_OHCI_2_INDEX;

		devoff = XLP_IO_USB_OHCI2_OFFSET(0);

		break;

	case PIC_OHCI_3_IRQ:

	       return PIC_IRT_OHCI_3_INDEX;

		devoff = XLP_IO_USB_OHCI3_OFFSET(0);

		break;

	case PIC_MMC_IRQ:

	       return PIC_IRT_MMC_INDEX;

		devoff = XLP_IO_SD_OFFSET(0);

		break;

	case PIC_I2C_0_IRQ:

		return PIC_IRT_I2C_0_INDEX;

		devoff = XLP_IO_I2C0_OFFSET(0);

		break;

	case PIC_I2C_1_IRQ:

		return PIC_IRT_I2C_1_INDEX;

		devoff = XLP_IO_I2C1_OFFSET(0);

		break;

	default:

		return -1;

		devoff = 0;

		break;

	}



	if (devoff != 0) {

		pcibase = nlm_pcicfg_base(devoff);

		irt = nlm_read_reg(pcibase, XLP_PCI_IRTINFO_REG) & 0xffff;

		/* HW bug, I2C 1 irt entry is off by one */

		if (irq == PIC_I2C_1_IRQ)

			irt = irt + 1;

	} else if (irq >= PIC_PCIE_LINK_0_IRQ && irq <= PIC_PCIE_LINK_3_IRQ) {

		/* HW bug, PCI IRT entries are bad on early silicon, fix */

		irt = PIC_IRT_PCIE_LINK_INDEX(irq - PIC_PCIE_LINK_0_IRQ);

	} else {

		irt = -1;

	}

	return irt;

}



unsigned int nlm_get_core_frequency(int node, int core)

CRA Git | Maintained and supported by SUSTech CRA and CCSE