mirror of https://git.freebsd.org/ports.git
John Nielsen
Fernando Apesteguía
parent
7d85071d4b
commit
4d56f9f5a3
|
|
@ -1,6 +1,5 @@
|
|||
PORTNAME= isboot-kmod
|
||||
DISTVERSION= 0.2.14
|
||||
PORTREVISION= 1
|
||||
DISTVERSION= 0.2.15
|
||||
CATEGORIES= net
|
||||
|
||||
MAINTAINER= john@jnielsen.net
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1621952121
|
||||
SHA256 (jnielsendotnet-isboot-0.2.14_GH0.tar.gz) = 6c5c9d17b97cf6ed977cda5d6f67409d68488cac768ba6202116a28f2decb2a2
|
||||
SIZE (jnielsendotnet-isboot-0.2.14_GH0.tar.gz) = 30628
|
||||
TIMESTAMP = 1693804462
|
||||
SHA256 (jnielsendotnet-isboot-0.2.15_GH0.tar.gz) = 40eb9d3f0668a8a1711bfa94493242788216d9245d6a4f31e4ae92daa2a36e5e
|
||||
SIZE (jnielsendotnet-isboot-0.2.15_GH0.tar.gz) = 31181
|
||||
|
|
|
|||
|
|
@ -1,86 +0,0 @@
|
|||
--- ibft.c.orig 2021-05-18 18:37:58 UTC
|
||||
+++ ibft.c
|
||||
@@ -146,13 +146,12 @@ ibft_print_address(uint8_t *addr)
|
||||
void
|
||||
ibft_print_address(uint8_t *addr)
|
||||
{
|
||||
- uint32_t n0, n1, n2, n3;
|
||||
+ uint32_t n0, n1, n2;
|
||||
|
||||
/* RFC2373 2.5.4 */
|
||||
n0 = be32toh(*(uint32_t *)(addr + 0));
|
||||
n1 = be32toh(*(uint32_t *)(addr + 4));
|
||||
n2 = be32toh(*(uint32_t *)(addr + 8));
|
||||
- n3 = be32toh(*(uint32_t *)(addr +12));
|
||||
if (n0 == 0 && n1 == 0 && n2 == 0x0000ffffU) {
|
||||
/* IPv4-mapped IPv6 */
|
||||
printf("%d.%d.%d.%d",
|
||||
@@ -188,7 +187,7 @@ ibft_parse_structure(uint8_t *ibft)
|
||||
struct ibft_nic *n0h, *n1h;
|
||||
struct ibft_target *t0h, *t1h;
|
||||
char oemid[6+1], oemtableid[8+1];
|
||||
- int id, version, length, index, flags;
|
||||
+ int id, length, index, flags;
|
||||
int revision, checksum;
|
||||
int name_length, name_offset;
|
||||
int sum, i;
|
||||
@@ -226,7 +225,6 @@ ibft_parse_structure(uint8_t *ibft)
|
||||
/* Control Structure (18 bytes or more) */
|
||||
ch = (struct ibft_control *)(ibft + 48);
|
||||
id = ch->id;
|
||||
- version = ch->version;
|
||||
length = le16toh(ch->length);
|
||||
index = ch->index;
|
||||
flags = ch->flags;
|
||||
@@ -258,7 +256,6 @@ ibft_parse_structure(uint8_t *ibft)
|
||||
if (ibft_initiator_offset != 0) {
|
||||
ih = (struct ibft_initiator *)(ibft + ibft_initiator_offset);
|
||||
id = ih->id;
|
||||
- version = ih->version;
|
||||
length = le16toh(ih->length);
|
||||
index = ih->index;
|
||||
flags = ih->flags;
|
||||
@@ -307,7 +304,6 @@ ibft_parse_structure(uint8_t *ibft)
|
||||
if (ibft_nic0_offset != 0) {
|
||||
n0h = (struct ibft_nic *)(ibft + ibft_nic0_offset);
|
||||
id = n0h->id;
|
||||
- version = n0h->version;
|
||||
length = le16toh(n0h->length);
|
||||
index = n0h->index;
|
||||
flags = n0h->flags;
|
||||
@@ -396,7 +392,6 @@ ibft_parse_structure(uint8_t *ibft)
|
||||
if (ibft_target0_offset != 0) {
|
||||
t0h = (struct ibft_target *)(ibft + ibft_target0_offset);
|
||||
id = t0h->id;
|
||||
- version = t0h->version;
|
||||
length = le16toh(t0h->length);
|
||||
index = t0h->index;
|
||||
flags = t0h->flags;
|
||||
@@ -480,7 +475,6 @@ ibft_parse_structure(uint8_t *ibft)
|
||||
if (ibft_nic1_offset != 0) {
|
||||
n1h = (struct ibft_nic *)(ibft + ibft_nic1_offset);
|
||||
id = n1h->id;
|
||||
- version = n1h->version;
|
||||
length = le16toh(n1h->length);
|
||||
index = n1h->index;
|
||||
flags = n1h->flags;
|
||||
@@ -499,7 +493,6 @@ ibft_parse_structure(uint8_t *ibft)
|
||||
if (ibft_target1_offset != 0) {
|
||||
t1h = (struct ibft_target *)(ibft + ibft_target1_offset);
|
||||
id = t1h->id;
|
||||
- version = t1h->version;
|
||||
length = le16toh(t1h->length);
|
||||
index = t1h->index;
|
||||
flags = t1h->flags;
|
||||
@@ -556,7 +549,11 @@ ibft_init(void)
|
||||
if (ibft_verbose) {
|
||||
printf("iBFT error\n");
|
||||
}
|
||||
+#if __FreeBSD_version >= 1400070
|
||||
+ pmap_unmapdev(vaddr,
|
||||
+#else
|
||||
pmap_unmapdev((vm_offset_t)vaddr,
|
||||
+#endif
|
||||
(vm_size_t)IBFT_HIGH_ADDR);
|
||||
return (error);
|
||||
}
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
--- isboot.c.orig 2022-05-11 20:13:59 UTC
|
||||
+++ isboot.c
|
||||
@@ -127,13 +127,12 @@ isboot_is_v4addr(uint8_t *addr)
|
||||
int
|
||||
isboot_is_v4addr(uint8_t *addr)
|
||||
{
|
||||
- uint32_t n0, n1, n2, n3;
|
||||
+ uint32_t n0, n1, n2;
|
||||
|
||||
/* RFC2373 2.5.4 */
|
||||
n0 = be32toh(*(uint32_t *)(addr + 0));
|
||||
n1 = be32toh(*(uint32_t *)(addr + 4));
|
||||
n2 = be32toh(*(uint32_t *)(addr + 8));
|
||||
- n3 = be32toh(*(uint32_t *)(addr +12));
|
||||
if (n0 == 0 && n1 == 0 && n2 == 0x0000ffffU)
|
||||
return (1); /* IPv4-mapped IPv6 */
|
||||
else
|
||||
|
|
@ -1,226 +0,0 @@
|
|||
--- iscsi.c.orig 2022-05-11 20:19:06 UTC
|
||||
+++ iscsi.c
|
||||
@@ -210,10 +210,12 @@ static struct isboot_sess isboot_g_sess;
|
||||
#define ISBOOT_TRACE(...) do { printf(__VA_ARGS__); } while (0)
|
||||
#define ISBOOT_TRACEDUMP(LABEL, BUF, LEN) \
|
||||
do { isboot_dump((LABEL), (BUF), (LEN)); } while (0)
|
||||
+#define __trace_used
|
||||
#else
|
||||
#define ISBOOT_ERROR(...) do { printf(__VA_ARGS__); } while (0)
|
||||
#define ISBOOT_TRACE(...)
|
||||
#define ISBOOT_TRACEDUMP(LABEL, BUF, LEN)
|
||||
+#define __trace_used __unused
|
||||
#endif
|
||||
|
||||
#ifdef ISBOOT_OPT_PREFERRED_HEADER_DIGEST
|
||||
@@ -1179,13 +1181,11 @@ isboot_recv_pdu(struct isboot_sess *sess, pdu_t *pp)
|
||||
struct uio uio;
|
||||
uint8_t *bhs;
|
||||
uint32_t crc32c;
|
||||
- uint32_t total;
|
||||
int error;
|
||||
int flags;
|
||||
int ahs_len, ds_len;
|
||||
|
||||
memset(&uio, 0, sizeof(uio));
|
||||
- total = 0;
|
||||
|
||||
/* BHS */
|
||||
flags = MSG_WAITALL;
|
||||
@@ -1201,7 +1201,6 @@ isboot_recv_pdu(struct isboot_sess *sess, pdu_t *pp)
|
||||
}
|
||||
m_copydata(mp, 0, ISCSI_BHS_LEN, (caddr_t)&pp->ipdu.bhs);
|
||||
m_freem(mp);
|
||||
- total += ISCSI_BHS_LEN;
|
||||
bhs = (uint8_t *)&pp->ipdu.bhs;
|
||||
ahs_len = DGET8(&bhs[4]);
|
||||
ahs_len *= 4;
|
||||
@@ -1246,7 +1245,6 @@ isboot_recv_pdu(struct isboot_sess *sess, pdu_t *pp)
|
||||
(caddr_t)pp->ahs_addr);
|
||||
m_freem(mp);
|
||||
pp->ahs_len = ahs_len;
|
||||
- total += ISCSI_ALIGN(ahs_len);
|
||||
}
|
||||
|
||||
/* HD */
|
||||
@@ -1265,7 +1263,6 @@ isboot_recv_pdu(struct isboot_sess *sess, pdu_t *pp)
|
||||
m_copydata(mp, 0, sizeof(pp->hdr_dig),
|
||||
(caddr_t)&pp->hdr_dig);
|
||||
m_freem(mp);
|
||||
- total += sizeof(pp->hdr_dig);
|
||||
}
|
||||
|
||||
/* DATA */
|
||||
@@ -1285,7 +1282,6 @@ isboot_recv_pdu(struct isboot_sess *sess, pdu_t *pp)
|
||||
(caddr_t)pp->ds_addr);
|
||||
m_freem(mp);
|
||||
pp->ds_len = ds_len;
|
||||
- total += ISCSI_ALIGN(ds_len);
|
||||
}
|
||||
|
||||
/* DD */
|
||||
@@ -1304,7 +1300,6 @@ isboot_recv_pdu(struct isboot_sess *sess, pdu_t *pp)
|
||||
m_copydata(mp, 0, sizeof(pp->ds_dig),
|
||||
(caddr_t)&pp->ds_dig);
|
||||
m_freem(mp);
|
||||
- total += sizeof(pp->ds_dig);
|
||||
}
|
||||
|
||||
/* check digest */
|
||||
@@ -1579,7 +1574,7 @@ isboot_rsp_login(struct isboot_sess *sess, pdu_t *pp)
|
||||
uint32_t ExpCmdSN, MaxCmdSN;
|
||||
uint16_t tsih;
|
||||
int T_bit;
|
||||
- int CSG, NSG;
|
||||
+ int NSG;
|
||||
int StatusClass, StatusDetail;
|
||||
int error;
|
||||
|
||||
@@ -1597,7 +1592,6 @@ isboot_rsp_login(struct isboot_sess *sess, pdu_t *pp)
|
||||
}
|
||||
|
||||
T_bit = BGET8(&rsp[1], 7);
|
||||
- CSG = BGET8W(&rsp[1], 3, 2);
|
||||
NSG = BGET8W(&rsp[1], 1, 2);
|
||||
tsih = DGET16(&rsp[14]);
|
||||
|
||||
@@ -2200,10 +2194,7 @@ isboot_action(struct cam_sim *sim, union ccb *ccb)
|
||||
static void
|
||||
isboot_action(struct cam_sim *sim, union ccb *ccb)
|
||||
{
|
||||
- struct isboot_sess *sess;
|
||||
-
|
||||
ISBOOT_TRACE("isboot action %x\n", ccb->ccb_h.func_code);
|
||||
- sess = (struct isboot_sess *)cam_sim_softc(sim);
|
||||
|
||||
switch (ccb->ccb_h.func_code) {
|
||||
case XPT_SCSI_IO:
|
||||
@@ -2291,14 +2282,12 @@ isboot_poll(struct cam_sim *sim)
|
||||
static void
|
||||
isboot_poll(struct cam_sim *sim)
|
||||
{
|
||||
- struct isboot_sess *sess;
|
||||
static int poll_out = 0;
|
||||
|
||||
if (poll_out == 0) {
|
||||
poll_out = 1;
|
||||
ISBOOT_TRACE("isboot poll\n");
|
||||
}
|
||||
- sess = (struct isboot_sess *)cam_sim_softc(sim);
|
||||
/* called after crash dump */
|
||||
/* XXX need flush? */
|
||||
}
|
||||
@@ -2681,14 +2670,13 @@ isboot_rsp_scsi(struct isboot_sess *sess, pdu_t *pp)
|
||||
uint8_t *sp;
|
||||
struct isboot_task *taskp;
|
||||
union ccb *ccb;
|
||||
- uint32_t ITT, SNT;
|
||||
- uint32_t StatSN;
|
||||
- uint32_t ExpCmdSN, MaxCmdSN;
|
||||
- uint32_t ExpDataSN;
|
||||
+ uint32_t ITT;
|
||||
+ uint32_t StatSN __trace_used;
|
||||
+ uint32_t ExpCmdSN __trace_used, MaxCmdSN __trace_used;
|
||||
+ uint32_t ExpDataSN __trace_used;
|
||||
int status, response;
|
||||
- int o_bit, u_bit, O_bit, U_bit;
|
||||
+ int o_bit __trace_used, u_bit __trace_used, O_bit, U_bit;
|
||||
int residual;
|
||||
- int bidi_residual;
|
||||
int len, sense_len;
|
||||
|
||||
ITT = DGET32(&rsp[16]);
|
||||
@@ -2718,11 +2706,9 @@ isboot_rsp_scsi(struct isboot_sess *sess, pdu_t *pp)
|
||||
mtx_unlock_spin(&sess->sn_mtx);
|
||||
|
||||
ITT = DGET32(&rsp[16]);
|
||||
- SNT = DGET32(&rsp[20]);
|
||||
ExpCmdSN = DGET32(&rsp[28]);
|
||||
MaxCmdSN = DGET32(&rsp[32]);
|
||||
ExpDataSN = DGET32(&rsp[36]);
|
||||
- bidi_residual = DGET32(&rsp[40]);
|
||||
residual = DGET32(&rsp[44]);
|
||||
|
||||
if (pp->ds_len > 2) {
|
||||
@@ -2822,12 +2808,11 @@ isboot_rsp_read_data(struct isboot_sess *sess, pdu_t *
|
||||
struct isboot_task *taskp;
|
||||
union ccb *ccb;
|
||||
uint8_t *data;
|
||||
- uint32_t ITT, TTT;
|
||||
- uint32_t StatSN;
|
||||
- uint32_t ExpCmdSN, MaxCmdSN;
|
||||
- uint32_t DataSN, ExpDataSN;
|
||||
+ uint32_t ITT;
|
||||
+ uint32_t StatSN __trace_used;
|
||||
+ uint32_t ExpCmdSN __trace_used, MaxCmdSN __trace_used;
|
||||
+ uint32_t DataSN __trace_used, ExpDataSN;
|
||||
uint32_t TL;
|
||||
- int error;
|
||||
int offset;
|
||||
int status, response;
|
||||
int len;
|
||||
@@ -2856,7 +2841,6 @@ isboot_rsp_read_data(struct isboot_sess *sess, pdu_t *
|
||||
len = pp->ds_len;
|
||||
status = 0;
|
||||
response = 0;
|
||||
- error = 0;
|
||||
|
||||
F_bit = BGET8(&rsp[1], 7);
|
||||
S_bit = BGET8(&rsp[1], 0);
|
||||
@@ -2877,7 +2861,6 @@ isboot_rsp_read_data(struct isboot_sess *sess, pdu_t *
|
||||
StatSN = 0;
|
||||
}
|
||||
ITT = DGET32(&rsp[16]);
|
||||
- TTT = DGET32(&rsp[20]);
|
||||
ExpCmdSN = DGET32(&rsp[28]);
|
||||
MaxCmdSN = DGET32(&rsp[32]);
|
||||
DataSN = DGET32(&rsp[36]);
|
||||
@@ -2975,9 +2958,8 @@ isboot_rsp_r2t(struct isboot_sess *sess, pdu_t *pp)
|
||||
uint8_t *data;
|
||||
uint64_t LUN;
|
||||
uint32_t ITT, TTT;
|
||||
- uint32_t R2TSN;
|
||||
uint32_t StatSN;
|
||||
- uint32_t ExpCmdSN, MaxCmdSN;
|
||||
+ uint32_t ExpCmdSN __trace_used, MaxCmdSN __trace_used;
|
||||
uint32_t DataSN;
|
||||
uint32_t TL;
|
||||
int error;
|
||||
@@ -3013,7 +2995,6 @@ isboot_rsp_r2t(struct isboot_sess *sess, pdu_t *pp)
|
||||
TTT = DGET32(&rsp[20]);
|
||||
ExpCmdSN = DGET32(&rsp[28]);
|
||||
MaxCmdSN = DGET32(&rsp[32]);
|
||||
- R2TSN = DGET32(&rsp[36]);
|
||||
offset = DGET32(&rsp[40]);
|
||||
len = DGET32(&rsp[44]);
|
||||
|
||||
@@ -3123,12 +3104,10 @@ isboot_rsp_nopin(struct isboot_sess *sess, pdu_t *pp)
|
||||
isboot_rsp_nopin(struct isboot_sess *sess, pdu_t *pp)
|
||||
{
|
||||
uint8_t *rsp = (uint8_t *)&pp->ipdu.bhs;
|
||||
- uint64_t LUN;
|
||||
uint32_t ITT, TTT;
|
||||
- uint32_t StatSN;
|
||||
- uint32_t ExpCmdSN, MaxCmdSN;
|
||||
+ uint32_t StatSN __trace_used;
|
||||
+ uint32_t ExpCmdSN __trace_used, MaxCmdSN __trace_used;
|
||||
|
||||
- LUN = DGET64(&rsp[8]);
|
||||
ITT = DGET32(&rsp[16]);
|
||||
TTT = DGET32(&rsp[20]);
|
||||
StatSN = DGET32(&rsp[24]);
|
||||
@@ -3166,13 +3145,12 @@ isboot_execute(struct isboot_sess *sess, pdu_t *pp)
|
||||
isboot_execute(struct isboot_sess *sess, pdu_t *pp)
|
||||
{
|
||||
uint8_t *bhs = (uint8_t *)&pp->ipdu.bhs;
|
||||
- int immediate, opcode;
|
||||
+ int opcode;
|
||||
int rc;
|
||||
|
||||
if (pp == NULL)
|
||||
return (EINVAL);
|
||||
|
||||
- immediate = BGET8W(&bhs[0], 6, 1);
|
||||
opcode = BGET8W(&bhs[0], 5, 6);
|
||||
|
||||
ISBOOT_TRACE("isboot_execute opcode=0x%x\n", opcode);
|
||||
Loading…
Reference in New Issue