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

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

[SPARC64]: Fix type and constant sizes wrt. sun4u IMAP/ICLR handling. 



Sometimes we were using 32-bit values and the top bits were
getting inadvertantly chopped off.  This will matter for the
forthcoming Fire controller MSI support.

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

arch/sparc64/kernel/irq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -308,7 +308,7 @@ static void sun4u_irq_disable(unsigned int virt_irq) 




	if (likely(data)) {

	if (likely(data)) {

		unsigned long imap = data->imap;

		unsigned long imap = data->imap;

		u32 tmp = upa_readq(imap);

		unsigned long tmp = upa_readq(imap);





		tmp &= ~IMAP_VALID;

		tmp &= ~IMAP_VALID;

		upa_writeq(tmp, imap);

		upa_writeq(tmp, imap);

include/asm-sparc64/irq.h

+11 −11
Original line number Original line Diff line number Diff line
@@ -16,21 +16,21 @@ 
#include <asm/ptrace.h>

#include <asm/ptrace.h>





/* IMAP/ICLR register defines */

/* IMAP/ICLR register defines */

#define IMAP_VALID		0x80000000	/* IRQ Enabled		*/

#define IMAP_VALID		0x80000000UL	/* IRQ Enabled		*/

#define IMAP_TID_UPA		0x7c000000	/* UPA TargetID		*/

#define IMAP_TID_UPA		0x7c000000UL	/* UPA TargetID		*/

#define IMAP_TID_JBUS		0x7c000000	/* JBUS TargetID	*/

#define IMAP_TID_JBUS		0x7c000000UL	/* JBUS TargetID	*/

#define IMAP_TID_SHIFT		26

#define IMAP_TID_SHIFT		26

#define IMAP_AID_SAFARI		0x7c000000	/* Safari AgentID	*/

#define IMAP_AID_SAFARI		0x7c000000UL	/* Safari AgentID	*/

#define IMAP_AID_SHIFT		26

#define IMAP_AID_SHIFT		26

#define IMAP_NID_SAFARI		0x03e00000	/* Safari NodeID	*/

#define IMAP_NID_SAFARI		0x03e00000UL	/* Safari NodeID	*/

#define IMAP_NID_SHIFT		21

#define IMAP_NID_SHIFT		21

#define IMAP_IGN		0x000007c0	/* IRQ Group Number	*/

#define IMAP_IGN		0x000007c0UL	/* IRQ Group Number	*/

#define IMAP_INO		0x0000003f	/* IRQ Number		*/

#define IMAP_INO		0x0000003fUL	/* IRQ Number		*/

#define IMAP_INR		0x000007ff	/* Full interrupt number*/

#define IMAP_INR		0x000007ffUL	/* Full interrupt number*/





#define ICLR_IDLE		0x00000000	/* Idle state		*/

#define ICLR_IDLE		0x00000000UL	/* Idle state		*/

#define ICLR_TRANSMIT		0x00000001	/* Transmit state	*/

#define ICLR_TRANSMIT		0x00000001UL	/* Transmit state	*/

#define ICLR_PENDING		0x00000003	/* Pending state	*/

#define ICLR_PENDING		0x00000003UL	/* Pending state	*/





/* The largest number of unique interrupt sources we support.

/* The largest number of unique interrupt sources we support.

 * If this needs to ever be larger than 255, you need to change

 * If this needs to ever be larger than 255, you need to change