upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

isp(4): Allow more than 2 ports to read WWNs from NVRAM.

Browse source 
It appears at least on QLE2694L cards 3rd and 4th ports follow the
same NVRAM addressing logic as the first two.  In lack of proper
documentation this guess is as good as it can be.

MFC after:	1 week
Sponsored by:	iXsystems, Inc.

(cherry picked from commit 483e464ed4)
This commit is contained in:
Alexander Motin 2021-12-14 13:20:14 -05:00
parent 8a45f0ab20
commit dd8d32c669
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sys/dev/isp/isp.c
View file

@ -4333,12 +4333,7 @@ isp_read_nvram_2400(ispsoftc_t *isp)
uint32_t addr, csum, lwrds, *dptr;
uint8_t nvram_data[ISP2400_NVRAM_SIZE];
if (isp->isp_port) {
addr = ISP2400_NVRAM_PORT1_ADDR;
} else {
addr = ISP2400_NVRAM_PORT0_ADDR;
}
addr = ISP2400_NVRAM_PORT_ADDR(isp->isp_port);
dptr = (uint32_t *) nvram_data;
for (lwrds = 0; lwrds < ISP2400_NVRAM_SIZE >> 2; lwrds++) {
isp_rd_2400_nvram(isp, addr++, dptr++);

3
sys/dev/isp/ispreg.h
View file

@ -213,8 +213,7 @@ typedef struct {
/*
* Qlogic 2400 NVRAM is an array of 512 bytes with a 32 bit checksum.
*/
#define ISP2400_NVRAM_PORT0_ADDR 0x80
#define ISP2400_NVRAM_PORT1_ADDR 0x180
#define ISP2400_NVRAM_PORT_ADDR(c) (0x100 * (c) + 0x80)
#define ISP2400_NVRAM_SIZE 512
#define ISP2400_NVRAM_VERSION(c) ((c)[4] | ((c)[5] << 8))