Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee29074d authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC64]: Fix new context version SMP handling. 



Don't piggy back the SMP receive signal code to do the
context version change handling.

Instead allocate another fixed PIL number for this
asynchronous cross-call.  We can't use smp_call_function()
because this thing is invoked with interrupts disabled
and a few spinlocks held.

Also, fix smp_call_function_mask() to count "cpus" correctly.
There is no guarentee that the local cpu is in the mask
yet that is exactly what this code was assuming.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a77754b4

arch/sparc64/kernel/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ unsigned int sun4v_vdev_device_interrupt(unsigned int dev_node) 
		return 0;

	}



	return sun4v_build_irq(sun4v_vdev_devhandle, irq, 4, 0);

	return sun4v_build_irq(sun4v_vdev_devhandle, irq, 5, 0);

}



static const char *cpu_mid_prop(void)

arch/sparc64/kernel/pci_psycho.c

+7 −7
Original line number Diff line number Diff line
@@ -286,17 +286,17 @@ static unsigned char psycho_pil_table[] = { 
/*0x14*/0, 0, 0, 0,	/* PCI B slot 1  Int A, B, C, D */

/*0x18*/0, 0, 0, 0,	/* PCI B slot 2  Int A, B, C, D */

/*0x1c*/0, 0, 0, 0,	/* PCI B slot 3  Int A, B, C, D */

/*0x20*/4,		/* SCSI				*/

/*0x20*/5,		/* SCSI				*/

/*0x21*/5,		/* Ethernet			*/

/*0x22*/8,		/* Parallel Port		*/

/*0x23*/13,		/* Audio Record			*/

/*0x24*/14,		/* Audio Playback		*/

/*0x25*/15,		/* PowerFail			*/

/*0x26*/4,		/* second SCSI			*/

/*0x26*/5,		/* second SCSI			*/

/*0x27*/11,		/* Floppy			*/

/*0x28*/4,		/* Spare Hardware		*/

/*0x28*/5,		/* Spare Hardware		*/

/*0x29*/9,		/* Keyboard			*/

/*0x2a*/4,		/* Mouse			*/

/*0x2a*/5,		/* Mouse			*/

/*0x2b*/12,		/* Serial			*/

/*0x2c*/10,		/* Timer 0			*/

/*0x2d*/11,		/* Timer 1			*/
@@ -313,11 +313,11 @@ static int psycho_ino_to_pil(struct pci_dev *pdev, unsigned int ino) 


	ret = psycho_pil_table[ino];

	if (ret == 0 && pdev == NULL) {

		ret = 4;

		ret = 5;

	} else if (ret == 0) {

		switch ((pdev->class >> 16) & 0xff) {

		case PCI_BASE_CLASS_STORAGE:

			ret = 4;

			ret = 5;

			break;



		case PCI_BASE_CLASS_NETWORK:
@@ -336,7 +336,7 @@ static int psycho_ino_to_pil(struct pci_dev *pdev, unsigned int ino) 
			break;



		default:

			ret = 4;

			ret = 5;

			break;

		};

	}

arch/sparc64/kernel/pci_sabre.c

+7 −7
Original line number Diff line number Diff line
@@ -533,17 +533,17 @@ static unsigned char sabre_pil_table[] = { 
/*0x14*/0, 0, 0, 0,	/* PCI B slot 1  Int A, B, C, D */

/*0x18*/0, 0, 0, 0,	/* PCI B slot 2  Int A, B, C, D */

/*0x1c*/0, 0, 0, 0,	/* PCI B slot 3  Int A, B, C, D */

/*0x20*/4,		/* SCSI				*/

/*0x20*/5,		/* SCSI				*/

/*0x21*/5,		/* Ethernet			*/

/*0x22*/8,		/* Parallel Port		*/

/*0x23*/13,		/* Audio Record			*/

/*0x24*/14,		/* Audio Playback		*/

/*0x25*/15,		/* PowerFail			*/

/*0x26*/4,		/* second SCSI			*/

/*0x26*/5,		/* second SCSI			*/

/*0x27*/11,		/* Floppy			*/

/*0x28*/4,		/* Spare Hardware		*/

/*0x28*/5,		/* Spare Hardware		*/

/*0x29*/9,		/* Keyboard			*/

/*0x2a*/4,		/* Mouse			*/

/*0x2a*/5,		/* Mouse			*/

/*0x2b*/12,		/* Serial			*/

/*0x2c*/10,		/* Timer 0			*/

/*0x2d*/11,		/* Timer 1			*/
@@ -565,11 +565,11 @@ static int sabre_ino_to_pil(struct pci_dev *pdev, unsigned int ino) 


	ret = sabre_pil_table[ino];

	if (ret == 0 && pdev == NULL) {

		ret = 4;

		ret = 5;

	} else if (ret == 0) {

		switch ((pdev->class >> 16) & 0xff) {

		case PCI_BASE_CLASS_STORAGE:

			ret = 4;

			ret = 5;

			break;



		case PCI_BASE_CLASS_NETWORK:
@@ -588,7 +588,7 @@ static int sabre_ino_to_pil(struct pci_dev *pdev, unsigned int ino) 
			break;



		default:

			ret = 4;

			ret = 5;

			break;

		};

	}

arch/sparc64/kernel/pci_schizo.c

+6 −6
Original line number Diff line number Diff line
@@ -243,8 +243,8 @@ static unsigned char schizo_pil_table[] = { 
/*0x0c*/0, 0, 0, 0,	/* PCI slot 3  Int A, B, C, D	*/

/*0x10*/0, 0, 0, 0,	/* PCI slot 4  Int A, B, C, D	*/

/*0x14*/0, 0, 0, 0,	/* PCI slot 5  Int A, B, C, D	*/

/*0x18*/4,		/* SCSI				*/

/*0x19*/4,		/* second SCSI			*/

/*0x18*/5,		/* SCSI				*/

/*0x19*/5,		/* second SCSI			*/

/*0x1a*/0,		/* UNKNOWN			*/

/*0x1b*/0,		/* UNKNOWN			*/

/*0x1c*/8,		/* Parallel			*/
@@ -254,7 +254,7 @@ static unsigned char schizo_pil_table[] = { 
/*0x20*/13,		/* Audio Record			*/

/*0x21*/14,		/* Audio Playback		*/

/*0x22*/12,		/* Serial			*/

/*0x23*/4,		/* EBUS I2C 			*/

/*0x23*/5,		/* EBUS I2C 			*/

/*0x24*/10,		/* RTC Clock			*/

/*0x25*/11,		/* Floppy			*/

/*0x26*/0,		/* UNKNOWN			*/
@@ -296,11 +296,11 @@ static int schizo_ino_to_pil(struct pci_dev *pdev, unsigned int ino) 


	ret = schizo_pil_table[ino];

	if (ret == 0 && pdev == NULL) {

		ret = 4;

		ret = 5;

	} else if (ret == 0) {

		switch ((pdev->class >> 16) & 0xff) {

		case PCI_BASE_CLASS_STORAGE:

			ret = 4;

			ret = 5;

			break;



		case PCI_BASE_CLASS_NETWORK:
@@ -319,7 +319,7 @@ static int schizo_ino_to_pil(struct pci_dev *pdev, unsigned int ino) 
			break;



		default:

			ret = 4;

			ret = 5;

			break;

		};

	}

arch/sparc64/kernel/pci_sun4v.c

+3 −3
Original line number Diff line number Diff line
@@ -735,11 +735,11 @@ static unsigned int pci_sun4v_irq_build(struct pci_pbm_info *pbm, 
	u32 devhandle = pbm->devhandle;

	int pil;



	pil = 4;

	pil = 5;

	if (pdev) {

		switch ((pdev->class >> 16) & 0xff) {

		case PCI_BASE_CLASS_STORAGE:

			pil = 4;

			pil = 5;

			break;



		case PCI_BASE_CLASS_NETWORK:
@@ -758,7 +758,7 @@ static unsigned int pci_sun4v_irq_build(struct pci_pbm_info *pbm, 
			break;



		default:

			pil = 4;

			pil = 5;

			break;

		};

	}