narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[intelxl] Allow for arbitrary placement of interrupt control register 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/92/head
Michael Brown 2019-04-24 17:11:31 +01:00
parent 2dbd9c0a3c
commit 1e0342ebd8
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/drivers/net/intelxl.c
View File

@ -1509,9 +1509,9 @@ static void intelxl_poll ( struct net_device *netdev ) {
/* Acknowledge interrupts, if applicable */ /* Acknowledge interrupts, if applicable */
if ( netdev_irq_enabled ( netdev ) ) { if ( netdev_irq_enabled ( netdev ) ) {
writel ( ( INTELXL_PFINT_DYN_CTL0_CLEARPBA | writel ( ( INTELXL_INT_DYN_CTL_CLEARPBA |
INTELXL_PFINT_DYN_CTL0_INTENA_MASK ), INTELXL_INT_DYN_CTL_INTENA_MASK ),
intelxl->regs + INTELXL_PFINT_DYN_CTL0 ); ( intelxl->regs + intelxl->intr ) );
} }
/* Poll for completed packets */ /* Poll for completed packets */
@ -1536,12 +1536,8 @@ static void intelxl_poll ( struct net_device *netdev ) {
static void intelxl_irq ( struct net_device *netdev, int enable ) { static void intelxl_irq ( struct net_device *netdev, int enable ) {
struct intelxl_nic *intelxl = netdev->priv; struct intelxl_nic *intelxl = netdev->priv;
if ( enable ) { writel ( ( enable ? INTELXL_INT_DYN_CTL_INTENA : 0 ),
writel ( INTELXL_PFINT_DYN_CTL0_INTENA, ( intelxl->regs + intelxl->intr ) );
intelxl->regs + INTELXL_PFINT_DYN_CTL0 );
} else {
writel ( 0, intelxl->regs + INTELXL_PFINT_DYN_CTL0 );
}
} }
/** Network device operations */ /** Network device operations */
@ -1585,6 +1581,7 @@ static int intelxl_probe ( struct pci_device *pci ) {
netdev->dev = &pci->dev; netdev->dev = &pci->dev;
memset ( intelxl, 0, sizeof ( *intelxl ) ); memset ( intelxl, 0, sizeof ( *intelxl ) );
intelxl->pf = PCI_FUNC ( pci->busdevfn ); intelxl->pf = PCI_FUNC ( pci->busdevfn );
intelxl->intr = INTELXL_PFINT_DYN_CTL0;
intelxl_init_admin ( &intelxl->command, INTELXL_ADMIN_CMD, intelxl_init_admin ( &intelxl->command, INTELXL_ADMIN_CMD,
&intelxl_admin_offsets ); &intelxl_admin_offsets );
intelxl_init_admin ( &intelxl->event, INTELXL_ADMIN_EVT, intelxl_init_admin ( &intelxl->event, INTELXL_ADMIN_EVT,

8
src/drivers/net/intelxl.h
View File

@ -735,9 +735,9 @@ intelxl_init_ring ( struct intelxl_ring *ring, unsigned int count, size_t len,
/** PF Interrupt Zero Dynamic Control Register */ /** PF Interrupt Zero Dynamic Control Register */
#define INTELXL_PFINT_DYN_CTL0 0x038480 #define INTELXL_PFINT_DYN_CTL0 0x038480
#define INTELXL_PFINT_DYN_CTL0_INTENA 0x00000001UL /**< Enable */ #define INTELXL_INT_DYN_CTL_INTENA 0x00000001UL /**< Enable */
#define INTELXL_PFINT_DYN_CTL0_CLEARPBA 0x00000002UL /**< Acknowledge */ #define INTELXL_INT_DYN_CTL_CLEARPBA 0x00000002UL /**< Acknowledge */
#define INTELXL_PFINT_DYN_CTL0_INTENA_MASK 0x80000000UL /**< Ignore enable */ #define INTELXL_INT_DYN_CTL_INTENA_MASK 0x80000000UL /**< Ignore enable */
/** PF Interrupt Zero Linked List Register */ /** PF Interrupt Zero Linked List Register */
#define INTELXL_PFINT_LNKLST0 0x038500 #define INTELXL_PFINT_LNKLST0 0x038500
@ -835,6 +835,8 @@ struct intelxl_nic {
unsigned int vsi; unsigned int vsi;
/** Queue set handle */ /** Queue set handle */
unsigned int qset; unsigned int qset;
/** Interrupt control register */
unsigned int intr;
/** Admin command queue */ /** Admin command queue */
struct intelxl_admin command; struct intelxl_admin command;