Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
effac03d
Commit
effac03d
authored
21 years ago
by
David Dillow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support the new 3CR990B cards that require authentication of the runtime firmware
image.
parent
9b37fb9b
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3562 additions
and
3352 deletions
+3562
-3352
drivers/net/typhoon-firmware.h
drivers/net/typhoon-firmware.h
+3538
-3350
drivers/net/typhoon.c
drivers/net/typhoon.c
+18
-2
drivers/net/typhoon.h
drivers/net/typhoon.h
+6
-0
No files found.
drivers/net/typhoon-firmware.h
View file @
effac03d
This diff is collapsed.
Click to expand it.
drivers/net/typhoon.c
View file @
effac03d
...
@@ -85,8 +85,8 @@ static const int multicast_filter_limit = 32;
...
@@ -85,8 +85,8 @@ static const int multicast_filter_limit = 32;
#define PKT_BUF_SZ 1536
#define PKT_BUF_SZ 1536
#define DRV_MODULE_NAME "typhoon"
#define DRV_MODULE_NAME "typhoon"
#define DRV_MODULE_VERSION "1.5.
2
"
#define DRV_MODULE_VERSION "1.5.
3
"
#define DRV_MODULE_RELDATE "03/1
1/2
5"
#define DRV_MODULE_RELDATE "03/1
2/1
5"
#define PFX DRV_MODULE_NAME ": "
#define PFX DRV_MODULE_NAME ": "
#define ERR_PFX KERN_ERR PFX
#define ERR_PFX KERN_ERR PFX
...
@@ -157,6 +157,7 @@ enum typhoon_cards {
...
@@ -157,6 +157,7 @@ enum typhoon_cards {
TYPHOON_TX
=
0
,
TYPHOON_TX95
,
TYPHOON_TX97
,
TYPHOON_SVR
,
TYPHOON_TX
=
0
,
TYPHOON_TX95
,
TYPHOON_TX97
,
TYPHOON_SVR
,
TYPHOON_SVR95
,
TYPHOON_SVR97
,
TYPHOON_TXM
,
TYPHOON_BSVR
,
TYPHOON_SVR95
,
TYPHOON_SVR97
,
TYPHOON_TXM
,
TYPHOON_BSVR
,
TYPHOON_FX95
,
TYPHOON_FX97
,
TYPHOON_FX95SVR
,
TYPHOON_FX97SVR
,
TYPHOON_FX95
,
TYPHOON_FX97
,
TYPHOON_FX95SVR
,
TYPHOON_FX97SVR
,
TYPHOON_FXM
,
};
};
/* directly indexed by enum typhoon_cards, above */
/* directly indexed by enum typhoon_cards, above */
...
@@ -185,6 +186,8 @@ static struct typhoon_card_info typhoon_card_info[] __devinitdata = {
...
@@ -185,6 +186,8 @@ static struct typhoon_card_info typhoon_card_info[] __devinitdata = {
TYPHOON_CRYPTO_DES
|
TYPHOON_FIBER
},
TYPHOON_CRYPTO_DES
|
TYPHOON_FIBER
},
{
"3Com Typhoon (3CR990-FX-97 Server)"
,
{
"3Com Typhoon (3CR990-FX-97 Server)"
,
TYPHOON_CRYPTO_DES
|
TYPHOON_CRYPTO_3DES
|
TYPHOON_FIBER
},
TYPHOON_CRYPTO_DES
|
TYPHOON_CRYPTO_3DES
|
TYPHOON_FIBER
},
{
"3Com Typhoon2 (3C990B-FX-97)"
,
TYPHOON_CRYPTO_VARIABLE
|
TYPHOON_FIBER
},
};
};
/* Notes on the new subsystem numbering scheme:
/* Notes on the new subsystem numbering scheme:
...
@@ -202,6 +205,8 @@ static struct pci_device_id typhoon_pci_tbl[] = {
...
@@ -202,6 +205,8 @@ static struct pci_device_id typhoon_pci_tbl[] = {
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
TYPHOON_TX97
},
PCI_ANY_ID
,
PCI_ANY_ID
,
0
,
0
,
TYPHOON_TX97
},
{
PCI_VENDOR_ID_3COM
,
PCI_DEVICE_ID_3COM_3CR990B
,
{
PCI_VENDOR_ID_3COM
,
PCI_DEVICE_ID_3COM_3CR990B
,
PCI_ANY_ID
,
0x1000
,
0
,
0
,
TYPHOON_TXM
},
PCI_ANY_ID
,
0x1000
,
0
,
0
,
TYPHOON_TXM
},
{
PCI_VENDOR_ID_3COM
,
PCI_DEVICE_ID_3COM_3CR990B
,
PCI_ANY_ID
,
0x1102
,
0
,
0
,
TYPHOON_FXM
},
{
PCI_VENDOR_ID_3COM
,
PCI_DEVICE_ID_3COM_3CR990B
,
{
PCI_VENDOR_ID_3COM
,
PCI_DEVICE_ID_3COM_3CR990B
,
PCI_ANY_ID
,
0x2000
,
0
,
0
,
TYPHOON_BSVR
},
PCI_ANY_ID
,
0x2000
,
0
,
0
,
TYPHOON_BSVR
},
{
PCI_VENDOR_ID_3COM
,
PCI_DEVICE_ID_3COM_3CR990_FX
,
{
PCI_VENDOR_ID_3COM
,
PCI_DEVICE_ID_3COM_3CR990_FX
,
...
@@ -1363,6 +1368,7 @@ typhoon_download_firmware(struct typhoon *tp)
...
@@ -1363,6 +1368,7 @@ typhoon_download_firmware(struct typhoon *tp)
u32
section_len
;
u32
section_len
;
u32
len
;
u32
len
;
u32
load_addr
;
u32
load_addr
;
u32
hmac
;
int
i
;
int
i
;
int
err
;
int
err
;
...
@@ -1406,6 +1412,16 @@ typhoon_download_firmware(struct typhoon *tp)
...
@@ -1406,6 +1412,16 @@ typhoon_download_firmware(struct typhoon *tp)
writel
(
TYPHOON_INTR_BOOTCMD
,
ioaddr
+
TYPHOON_REG_INTR_STATUS
);
writel
(
TYPHOON_INTR_BOOTCMD
,
ioaddr
+
TYPHOON_REG_INTR_STATUS
);
writel
(
load_addr
,
ioaddr
+
TYPHOON_REG_DOWNLOAD_BOOT_ADDR
);
writel
(
load_addr
,
ioaddr
+
TYPHOON_REG_DOWNLOAD_BOOT_ADDR
);
hmac
=
le32_to_cpu
(
fHdr
->
hmacDigest
[
0
]);
writel
(
hmac
,
ioaddr
+
TYPHOON_REG_DOWNLOAD_HMAC_0
);
hmac
=
le32_to_cpu
(
fHdr
->
hmacDigest
[
1
]);
writel
(
hmac
,
ioaddr
+
TYPHOON_REG_DOWNLOAD_HMAC_1
);
hmac
=
le32_to_cpu
(
fHdr
->
hmacDigest
[
2
]);
writel
(
hmac
,
ioaddr
+
TYPHOON_REG_DOWNLOAD_HMAC_2
);
hmac
=
le32_to_cpu
(
fHdr
->
hmacDigest
[
3
]);
writel
(
hmac
,
ioaddr
+
TYPHOON_REG_DOWNLOAD_HMAC_3
);
hmac
=
le32_to_cpu
(
fHdr
->
hmacDigest
[
4
]);
writel
(
hmac
,
ioaddr
+
TYPHOON_REG_DOWNLOAD_HMAC_4
);
typhoon_post_pci_writes
(
ioaddr
);
typhoon_post_pci_writes
(
ioaddr
);
writel
(
TYPHOON_BOOTCMD_RUNTIME_IMAGE
,
ioaddr
+
TYPHOON_REG_COMMAND
);
writel
(
TYPHOON_BOOTCMD_RUNTIME_IMAGE
,
ioaddr
+
TYPHOON_REG_COMMAND
);
...
...
This diff is collapsed.
Click to expand it.
drivers/net/typhoon.h
View file @
effac03d
...
@@ -512,6 +512,7 @@ struct typhoon_file_header {
...
@@ -512,6 +512,7 @@ struct typhoon_file_header {
u32
version
;
u32
version
;
u32
numSections
;
u32
numSections
;
u32
startAddr
;
u32
startAddr
;
u32
hmacDigest
[
5
];
}
__attribute__
((
packed
));
}
__attribute__
((
packed
));
struct
typhoon_section_header
{
struct
typhoon_section_header
{
...
@@ -548,6 +549,11 @@ struct typhoon_section_header {
...
@@ -548,6 +549,11 @@ struct typhoon_section_header {
#define TYPHOON_REG_BOOT_LENGTH TYPHOON_REG_HOST2ARM1
#define TYPHOON_REG_BOOT_LENGTH TYPHOON_REG_HOST2ARM1
#define TYPHOON_REG_DOWNLOAD_BOOT_ADDR TYPHOON_REG_HOST2ARM1
#define TYPHOON_REG_DOWNLOAD_BOOT_ADDR TYPHOON_REG_HOST2ARM1
#define TYPHOON_REG_DOWNLOAD_HMAC_0 TYPHOON_REG_HOST2ARM2
#define TYPHOON_REG_DOWNLOAD_HMAC_1 TYPHOON_REG_HOST2ARM3
#define TYPHOON_REG_DOWNLOAD_HMAC_2 TYPHOON_REG_HOST2ARM4
#define TYPHOON_REG_DOWNLOAD_HMAC_3 TYPHOON_REG_HOST2ARM5
#define TYPHOON_REG_DOWNLOAD_HMAC_4 TYPHOON_REG_HOST2ARM6
#define TYPHOON_REG_BOOT_RECORD_ADDR_HI TYPHOON_REG_HOST2ARM2
#define TYPHOON_REG_BOOT_RECORD_ADDR_HI TYPHOON_REG_HOST2ARM2
#define TYPHOON_REG_BOOT_RECORD_ADDR_LO TYPHOON_REG_HOST2ARM1
#define TYPHOON_REG_BOOT_RECORD_ADDR_LO TYPHOON_REG_HOST2ARM1
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment