Skip to content

Commit

Permalink
[phantom] Change register space abstraction to match other drivers
Browse files Browse the repository at this point in the history 
Most other Phantom drivers define a register space in terms of a 64M
virtual address space.  While this doesn't map in any meaningful way
to the actual addresses used on the latest cards, it makes maintenance
easier if we do the same.
  • Loading branch information
Michael Brown committed Oct 24, 2008
1 parent bcc70d6 commit d4c8273
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 54 deletions.
86 changes: 39 additions & 47 deletions src/drivers/net/phantom/phantom.c
View file
Expand Up @@ -228,21 +228,8 @@ struct phantom_nic {
*/
static unsigned long phantom_crb_access_128m ( struct phantom_nic *phantom,
unsigned long reg ) {
static const uint32_t reg_window[] = {
[UNM_CRB_BLK_PCIE] = 0x0000000,
[UNM_CRB_BLK_CAM] = 0x2000000,
[UNM_CRB_BLK_ROMUSB] = 0x2000000,
[UNM_CRB_BLK_TEST] = 0x0000000,
};
static const uint32_t reg_bases[] = {
[UNM_CRB_BLK_PCIE] = 0x6100000,
[UNM_CRB_BLK_CAM] = 0x6200000,
[UNM_CRB_BLK_ROMUSB] = 0x7300000,
[UNM_CRB_BLK_TEST] = 0x6200000,
};
unsigned int block = UNM_CRB_BLK ( reg );
unsigned long offset = UNM_CRB_OFFSET ( reg );
uint32_t window = reg_window[block];
unsigned long offset = ( 0x6000000 + ( reg & 0x1ffffff ) );
uint32_t window = ( reg & 0x2000000 );
uint32_t verify_window;

if ( phantom->crb_window != window ) {
Expand All @@ -258,7 +245,7 @@ static unsigned long phantom_crb_access_128m ( struct phantom_nic *phantom,
phantom->crb_window = window;
}

return ( reg_bases[block] + offset );
return offset;
}

/**
Expand All @@ -270,21 +257,8 @@ static unsigned long phantom_crb_access_128m ( struct phantom_nic *phantom,
*/
static unsigned long phantom_crb_access_32m ( struct phantom_nic *phantom,
unsigned long reg ) {
static const uint32_t reg_window[] = {
[UNM_CRB_BLK_PCIE] = 0x0000000,
[UNM_CRB_BLK_CAM] = 0x2000000,
[UNM_CRB_BLK_ROMUSB] = 0x2000000,
[UNM_CRB_BLK_TEST] = 0x0000000,
};
static const uint32_t reg_bases[] = {
[UNM_CRB_BLK_PCIE] = 0x0100000,
[UNM_CRB_BLK_CAM] = 0x0200000,
[UNM_CRB_BLK_ROMUSB] = 0x1300000,
[UNM_CRB_BLK_TEST] = 0x0200000,
};
unsigned int block = UNM_CRB_BLK ( reg );
unsigned long offset = UNM_CRB_OFFSET ( reg );
uint32_t window = reg_window[block];
unsigned long offset = ( reg & 0x1ffffff );
uint32_t window = ( reg & 0x2000000 );
uint32_t verify_window;

if ( phantom->crb_window != window ) {
Expand All @@ -300,7 +274,7 @@ static unsigned long phantom_crb_access_32m ( struct phantom_nic *phantom,
phantom->crb_window = window;
}

return ( reg_bases[block] + offset );
return offset;
}

/**
Expand All @@ -312,31 +286,49 @@ static unsigned long phantom_crb_access_32m ( struct phantom_nic *phantom,
*/
static unsigned long phantom_crb_access_2m ( struct phantom_nic *phantom,
unsigned long reg ) {
static const uint32_t reg_window_hi[] = {
[UNM_CRB_BLK_PCIE] = 0x77300000,
[UNM_CRB_BLK_CAM] = 0x41600000,
[UNM_CRB_BLK_ROMUSB] = 0x42100000,
[UNM_CRB_BLK_TEST] = 0x29500000,
static const struct {
uint8_t block;
uint16_t window_hi;
} reg_window_hi[] = {
{ UNM_CRB_BLK_PCIE, 0x773 },
{ UNM_CRB_BLK_CAM, 0x416 },
{ UNM_CRB_BLK_ROMUSB, 0x421 },
{ UNM_CRB_BLK_TEST, 0x295 },
};
unsigned int block = UNM_CRB_BLK ( reg );
unsigned long offset = UNM_CRB_OFFSET ( reg );
uint32_t window = ( reg_window_hi[block] | ( offset & 0x000f0000 ) );
uint32_t window;
uint32_t verify_window;
unsigned int i;

if ( phantom->crb_window != window ) {
for ( i = 0 ; i < ( sizeof ( reg_window_hi ) /
sizeof ( reg_window_hi[0] ) ) ; i++ ) {

/* Write to the CRB window register */
writel ( window, phantom->bar0 + UNM_2M_CRB_WINDOW );
if ( reg_window_hi[i].block != block )
continue;

/* Ensure that the write has reached the card */
verify_window = readl ( phantom->bar0 + UNM_2M_CRB_WINDOW );
assert ( verify_window == window );
window = ( ( reg_window_hi[i].window_hi << 20 ) |
( offset & 0x000f0000 ) );

/* Record new window */
phantom->crb_window = window;
if ( phantom->crb_window != window ) {

/* Write to the CRB window register */
writel ( window, phantom->bar0 + UNM_2M_CRB_WINDOW );

/* Ensure that the write has reached the card */
verify_window = readl ( phantom->bar0 +
UNM_2M_CRB_WINDOW );
assert ( verify_window == window );

/* Record new window */
phantom->crb_window = window;
}

return ( 0x1e0000 + ( offset & 0xffff ) );
}

return ( 0x1e0000 + ( offset & 0xffff ) );
assert ( 0 );
return 0;
}

/**
Expand Down
14 changes: 7 additions & 7 deletions src/drivers/net/phantom/phantom.h
View file
Expand Up @@ -76,14 +76,14 @@ typedef uint32_t nx_rcode_t;
* address by the phantom_crb_access_xxx() methods.
*/
enum unm_reg_blocks {
UNM_CRB_BLK_PCIE,
UNM_CRB_BLK_CAM,
UNM_CRB_BLK_ROMUSB,
UNM_CRB_BLK_TEST,
UNM_CRB_BLK_PCIE = 0x01,
UNM_CRB_BLK_CAM = 0x22,
UNM_CRB_BLK_ROMUSB = 0x33,
UNM_CRB_BLK_TEST = 0x02,
};
#define UNM_CRB_BASE(blk) ( (blk) << 24 )
#define UNM_CRB_BLK(reg) ( (reg) >> 24 )
#define UNM_CRB_OFFSET(reg) ( (reg) & 0x00ffffff )
#define UNM_CRB_BASE(blk) ( (blk) << 20 )
#define UNM_CRB_BLK(reg) ( (reg) >> 20 )
#define UNM_CRB_OFFSET(reg) ( (reg) & 0x000fffff )

#define UNM_CRB_PCIE UNM_CRB_BASE ( UNM_CRB_BLK_PCIE )
#define UNM_PCIE_SEM2_LOCK ( UNM_CRB_PCIE + 0x1c010 )
Expand Down

0 comments on commit d4c8273

Please sign in to comment.