diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2010-06-05 17:24:30 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-06 17:55:58 -0700 |
| commit | f92d9dc1504a964acfe07e8036fa30dcef22d343 (patch) | |
| tree | 725728b7cf59480858ad58c1d29a96537fd8f8ce /drivers/net/tg3.h | |
| parent | eedc765ca4b19a41cf0b921a492ac08d640060d1 (diff) | |
| download | linux-f92d9dc1504a964acfe07e8036fa30dcef22d343.tar.gz linux-f92d9dc1504a964acfe07e8036fa30dcef22d343.tar.bz2 linux-f92d9dc1504a964acfe07e8036fa30dcef22d343.zip | |
tg3: Relocate APE mutex regs for 5717+
The 5717 and later devices relocate the APE mutex registers. This patch
organizes the code so that the driver can use the mutex registers in the
old and new locations.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.h')
| -rw-r--r-- | drivers/net/tg3.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index ce9c4918c318..84ea0dca7d29 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h @@ -231,6 +231,7 @@ #define PCISTATE_RETRY_SAME_DMA 0x00002000 #define PCISTATE_ALLOW_APE_CTLSPC_WR 0x00010000 #define PCISTATE_ALLOW_APE_SHMEM_WR 0x00020000 +#define PCISTATE_ALLOW_APE_PSPACE_WR 0x00040000 #define TG3PCI_CLOCK_CTRL 0x00000074 #define CLOCK_CTRL_CORECLK_DISABLE 0x00000200 #define CLOCK_CTRL_RXCLK_DISABLE 0x00000400 @@ -2209,6 +2210,11 @@ #define APE_EVENT_STATUS_STATE_SUSPEND 0x00040000 #define APE_EVENT_STATUS_EVENT_PENDING 0x80000000 +#define TG3_APE_PER_LOCK_REQ 0x8400 +#define APE_LOCK_PER_REQ_DRIVER 0x00001000 +#define TG3_APE_PER_LOCK_GRANT 0x8420 +#define APE_PER_LOCK_GRANT_DRIVER 0x00001000 + /* APE convenience enumerations. */ #define TG3_APE_LOCK_GRC 1 #define TG3_APE_LOCK_MEM 4 |