Skip to content

Commit

Permalink
[TG3]: Add nvram lock-out support for 5752 TPM
Browse files Browse the repository at this point in the history 
Add support for the NVRAM lock-out feature for TPM in 5752. If lock-out
is enabled, certain NVRAM registers cannot be written to.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Michael Chan authored and David S. Miller committed Apr 22, 2005
1 parent 361b4ac commit e6af301
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 34 deletions.
70 changes: 36 additions & 34 deletions drivers/net/tg3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3731,6 +3731,28 @@ static void tg3_nvram_unlock(struct tg3 *tp)
tw32_f(NVRAM_SWARB, SWARB_REQ_CLR1);
}

/* tp->lock is held. */
static void tg3_enable_nvram_access(struct tg3 *tp)
{
if ((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) &&
!(tp->tg3_flags2 & TG3_FLG2_PROTECTED_NVRAM)) {
u32 nvaccess = tr32(NVRAM_ACCESS);

tw32(NVRAM_ACCESS, nvaccess | ACCESS_ENABLE);
}
}

/* tp->lock is held. */
static void tg3_disable_nvram_access(struct tg3 *tp)
{
if ((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) &&
!(tp->tg3_flags2 & TG3_FLG2_PROTECTED_NVRAM)) {
u32 nvaccess = tr32(NVRAM_ACCESS);

tw32(NVRAM_ACCESS, nvaccess & ~ACCESS_ENABLE);
}
}

/* tp->lock is held. */
static void tg3_write_sig_pre_reset(struct tg3 *tp, int kind)
{
Expand Down Expand Up @@ -7102,6 +7124,10 @@ static void __devinit tg3_get_5752_nvram_info(struct tg3 *tp)

nvcfg1 = tr32(NVRAM_CFG1);

/* NVRAM protection for TPM */
if (nvcfg1 & (1 << 27))
tp->tg3_flags2 |= TG3_FLG2_PROTECTED_NVRAM;

switch (nvcfg1 & NVRAM_CFG1_5752VENDOR_MASK) {
case FLASH_5752VENDOR_ATMEL_EEPROM_64KHZ:
case FLASH_5752VENDOR_ATMEL_EEPROM_376KHZ:
Expand Down Expand Up @@ -7179,11 +7205,7 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)
GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) {
tp->tg3_flags |= TG3_FLAG_NVRAM;

if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) {
u32 nvaccess = tr32(NVRAM_ACCESS);

tw32(NVRAM_ACCESS, nvaccess | ACCESS_ENABLE);
}
tg3_enable_nvram_access(tp);

if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
tg3_get_5752_nvram_info(tp);
Expand All @@ -7192,11 +7214,7 @@ static void __devinit tg3_nvram_init(struct tg3 *tp)

tg3_get_nvram_size(tp);

if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) {
u32 nvaccess = tr32(NVRAM_ACCESS);

tw32(NVRAM_ACCESS, nvaccess & ~ACCESS_ENABLE);
}
tg3_disable_nvram_access(tp);

} else {
tp->tg3_flags &= ~(TG3_FLAG_NVRAM | TG3_FLAG_NVRAM_BUFFERED);
Expand Down Expand Up @@ -7285,11 +7303,7 @@ static int tg3_nvram_read(struct tg3 *tp, u32 offset, u32 *val)

tg3_nvram_lock(tp);

if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) {
u32 nvaccess = tr32(NVRAM_ACCESS);

tw32_f(NVRAM_ACCESS, nvaccess | ACCESS_ENABLE);
}
tg3_enable_nvram_access(tp);

tw32(NVRAM_ADDR, offset);
ret = tg3_nvram_exec_cmd(tp, NVRAM_CMD_RD | NVRAM_CMD_GO |
Expand All @@ -7300,11 +7314,7 @@ static int tg3_nvram_read(struct tg3 *tp, u32 offset, u32 *val)

tg3_nvram_unlock(tp);

if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) {
u32 nvaccess = tr32(NVRAM_ACCESS);

tw32_f(NVRAM_ACCESS, nvaccess & ~ACCESS_ENABLE);
}
tg3_disable_nvram_access(tp);

return ret;
}
Expand Down Expand Up @@ -7367,7 +7377,7 @@ static int tg3_nvram_write_block_unbuffered(struct tg3 *tp, u32 offset, u32 len,

while (len) {
int j;
u32 phy_addr, page_off, size, nvaccess;
u32 phy_addr, page_off, size;

phy_addr = offset & ~pagemask;

Expand All @@ -7390,8 +7400,7 @@ static int tg3_nvram_write_block_unbuffered(struct tg3 *tp, u32 offset, u32 len,

offset = offset + (pagesize - page_off);

nvaccess = tr32(NVRAM_ACCESS);
tw32_f(NVRAM_ACCESS, nvaccess | ACCESS_ENABLE);
tg3_enable_nvram_access(tp);

/*
* Before we can erase the flash page, we need
Expand Down Expand Up @@ -7528,13 +7537,10 @@ static int tg3_nvram_write_block(struct tg3 *tp, u32 offset, u32 len, u8 *buf)

tg3_nvram_lock(tp);

if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) {
u32 nvaccess = tr32(NVRAM_ACCESS);

tw32(NVRAM_ACCESS, nvaccess | ACCESS_ENABLE);

tg3_enable_nvram_access(tp);
if ((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) &&
!(tp->tg3_flags2 & TG3_FLG2_PROTECTED_NVRAM))
tw32(NVRAM_WRITE1, 0x406);
}

grc_mode = tr32(GRC_MODE);
tw32(GRC_MODE, grc_mode | GRC_MODE_NVRAM_WR_ENABLE);
Expand All @@ -7553,11 +7559,7 @@ static int tg3_nvram_write_block(struct tg3 *tp, u32 offset, u32 len, u8 *buf)
grc_mode = tr32(GRC_MODE);
tw32(GRC_MODE, grc_mode & ~GRC_MODE_NVRAM_WR_ENABLE);

if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS) {
u32 nvaccess = tr32(NVRAM_ACCESS);

tw32(NVRAM_ACCESS, nvaccess & ~ACCESS_ENABLE);
}
tg3_disable_nvram_access(tp);
tg3_nvram_unlock(tp);
}

Expand Down
1 change: 1 addition & 0 deletions drivers/net/tg3.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2122,6 +2122,7 @@ struct tg3 {
#define TG3_FLG2_SERDES_PREEMPHASIS 0x00020000
#define TG3_FLG2_5705_PLUS 0x00040000
#define TG3_FLG2_5750_PLUS 0x00080000
#define TG3_FLG2_PROTECTED_NVRAM 0x00100000

u32 split_mode_max_reqs;
#define SPLIT_MODE_5704_MAX_REQ 3
Expand Down

0 comments on commit e6af301

Please sign in to comment.