Page MenuHomeFreeBSD
Files F115661275

D47179.id145116.diff
No OneTemporary
Actions

D47179.id145116.diff
View Options

diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c
--- a/sys/dev/ipmi/ipmi.c
+++ b/sys/dev/ipmi/ipmi.c
@@ -360,7 +360,7 @@
kreq->ir_request[req->msg.data_len + 7] =
ipmi_ipmb_checksum(&kreq->ir_request[4],
req->msg.data_len + 3);
- error = ipmi_submit_driver_request(sc, kreq, MAX_TIMEOUT);
+ error = ipmi_submit_driver_request(sc, kreq);
if (error != 0)
return (error);
@@ -565,11 +565,10 @@
/* Perform an internal driver request. */
int
-ipmi_submit_driver_request(struct ipmi_softc *sc, struct ipmi_request *req,
- int timo)
+ipmi_submit_driver_request(struct ipmi_softc *sc, struct ipmi_request *req)
{
- return (sc->ipmi_driver_request(sc, req, timo));
+ return (sc->ipmi_driver_request(sc, req));
}
/*
@@ -636,7 +635,7 @@
IPMI_ALLOC_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0),
IPMI_RESET_WDOG, 0, 0);
- error = ipmi_submit_driver_request(sc, req, 0);
+ error = ipmi_submit_driver_request(sc, req);
if (error) {
device_printf(sc->ipmi_dev, "Failed to reset watchdog\n");
} else if (req->ir_compcode == 0x80) {
@@ -677,7 +676,7 @@
req->ir_request[4] = 0;
req->ir_request[5] = 0;
}
- error = ipmi_submit_driver_request(sc, req, 0);
+ error = ipmi_submit_driver_request(sc, req);
if (error) {
device_printf(sc->ipmi_dev, "Failed to set watchdog\n");
} else if (req->ir_compcode != 0) {
@@ -812,7 +811,7 @@
IPMI_CHASSIS_CONTROL, 1, 0);
req->ir_request[0] = IPMI_CC_POWER_CYCLE;
- ipmi_submit_driver_request(sc, req, MAX_TIMEOUT);
+ ipmi_submit_driver_request(sc, req);
if (req->ir_error != 0 || req->ir_compcode != 0) {
device_printf(sc->ipmi_dev, "Power cycling via IPMI failed code %#x %#x\n",
@@ -859,7 +858,7 @@
IPMI_ALLOC_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0),
IPMI_GET_DEVICE_ID, 0, 15);
- error = ipmi_submit_driver_request(sc, req, MAX_TIMEOUT);
+ error = ipmi_submit_driver_request(sc, req);
if (error == EWOULDBLOCK) {
device_printf(dev, "Timed out waiting for GET_DEVICE_ID\n");
return;
@@ -888,7 +887,7 @@
IPMI_INIT_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0),
IPMI_CLEAR_FLAGS, 1, 0);
- ipmi_submit_driver_request(sc, req, 0);
+ ipmi_submit_driver_request(sc, req);
/* XXX: Magic numbers */
if (req->ir_compcode == 0xc0) {
@@ -903,7 +902,7 @@
IPMI_GET_CHANNEL_INFO, 1, 0);
req->ir_request[0] = i;
- error = ipmi_submit_driver_request(sc, req, 0);
+ error = ipmi_submit_driver_request(sc, req);
if (error != 0 || req->ir_compcode != 0)
break;
@@ -918,7 +917,7 @@
IPMI_INIT_DRIVER_REQUEST(req, IPMI_ADDR(IPMI_APP_REQUEST, 0),
IPMI_GET_WDOG, 0, 0);
- error = ipmi_submit_driver_request(sc, req, 0);
+ error = ipmi_submit_driver_request(sc, req);
if (error == 0 && req->ir_compcode == 0x00) {
device_printf(dev, "Attached watchdog\n");
diff --git a/sys/dev/ipmi/ipmi_bt.c b/sys/dev/ipmi/ipmi_bt.c
--- a/sys/dev/ipmi/ipmi_bt.c
+++ b/sys/dev/ipmi/ipmi_bt.c
@@ -85,7 +85,7 @@
#define BT_IM_BMC_HWRST (1L << 7)
static int bt_polled_request(struct ipmi_softc *, struct ipmi_request *);
-static int bt_driver_request(struct ipmi_softc *, struct ipmi_request *, int);
+static int bt_driver_request(struct ipmi_softc *, struct ipmi_request *);
static int bt_wait(struct ipmi_softc *, uint8_t, uint8_t);
static int bt_reset(struct ipmi_softc *);
@@ -247,7 +247,7 @@
IPMI_LOCK(sc);
while ((req = ipmi_dequeue_request(sc)) != NULL) {
IPMI_UNLOCK(sc);
- (void)bt_driver_request(sc, req, 0);
+ (void)bt_driver_request(sc, req);
IPMI_LOCK(sc);
sc->ipmi_bt_seq++;
ipmi_complete_request(sc, req);
@@ -265,7 +265,7 @@
}
static int
-bt_driver_request(struct ipmi_softc *sc, struct ipmi_request *req, int timo __unused)
+bt_driver_request(struct ipmi_softc *sc, struct ipmi_request *req)
{
int i, ok;
diff --git a/sys/dev/ipmi/ipmi_kcs.c b/sys/dev/ipmi/ipmi_kcs.c
--- a/sys/dev/ipmi/ipmi_kcs.c
+++ b/sys/dev/ipmi/ipmi_kcs.c
@@ -488,13 +488,13 @@
}
static int
-kcs_driver_request_queue(struct ipmi_softc *sc, struct ipmi_request *req, int timo)
+kcs_driver_request_queue(struct ipmi_softc *sc, struct ipmi_request *req)
{
int error;
IPMI_LOCK(sc);
ipmi_polled_enqueue_request_highpri(sc, req);
- error = msleep(req, &sc->ipmi_requests_lock, 0, "ipmireq", timo);
+ error = msleep(req, &sc->ipmi_requests_lock, 0, "ipmireq", 0);
if (error == 0)
error = req->ir_error;
IPMI_UNLOCK(sc);
@@ -517,13 +517,13 @@
}
static int
-kcs_driver_request(struct ipmi_softc *sc, struct ipmi_request *req, int timo)
+kcs_driver_request(struct ipmi_softc *sc, struct ipmi_request *req)
{
if (KERNEL_PANICKED() || dumping)
return (kcs_driver_request_poll(sc, req));
else
- return (kcs_driver_request_queue(sc, req, timo));
+ return (kcs_driver_request_queue(sc, req));
}
diff --git a/sys/dev/ipmi/ipmi_opal.c b/sys/dev/ipmi/ipmi_opal.c
--- a/sys/dev/ipmi/ipmi_opal.c
+++ b/sys/dev/ipmi/ipmi_opal.c
@@ -142,8 +142,7 @@
}
static int
-opal_ipmi_polled_request(struct opal_ipmi_softc *sc, struct ipmi_request *req,
- int timo)
+opal_ipmi_polled_request(struct opal_ipmi_softc *sc, struct ipmi_request *req)
{
uint64_t msg_len;
int err;
@@ -192,7 +191,7 @@
goto out;
}
- if ((err = opal_ipmi_recv(sc, &msg_len, timo)) == 0) {
+ if ((err = opal_ipmi_recv(sc, &msg_len, 0)) == 0) {
/* Subtract one extra for the completion code. */
req->ir_replylen = msg_len - sizeof(struct opal_ipmi_msg) - 1;
req->ir_replylen = min(req->ir_replylen, req->ir_replybuflen);
@@ -248,15 +247,14 @@
}
static int
-opal_ipmi_driver_request(struct ipmi_softc *isc, struct ipmi_request *req,
- int timo)
+opal_ipmi_driver_request(struct ipmi_softc *isc, struct ipmi_request *req)
{
struct opal_ipmi_softc *sc = (struct opal_ipmi_softc *)isc;
int i, err;
for (i = 0; i < 3; i++) {
IPMI_LOCK(&sc->ipmi);
- err = opal_ipmi_polled_request(sc, req, timo);
+ err = opal_ipmi_polled_request(sc, req);
IPMI_UNLOCK(&sc->ipmi);
if (err == 0)
break;
diff --git a/sys/dev/ipmi/ipmi_smic.c b/sys/dev/ipmi/ipmi_smic.c
--- a/sys/dev/ipmi/ipmi_smic.c
+++ b/sys/dev/ipmi/ipmi_smic.c
@@ -388,7 +388,7 @@
}
static int
-smic_driver_request(struct ipmi_softc *sc, struct ipmi_request *req, int timo)
+smic_driver_request(struct ipmi_softc *sc, struct ipmi_request *req)
{
int i, ok;
diff --git a/sys/dev/ipmi/ipmi_ssif.c b/sys/dev/ipmi/ipmi_ssif.c
--- a/sys/dev/ipmi/ipmi_ssif.c
+++ b/sys/dev/ipmi/ipmi_ssif.c
@@ -359,15 +359,14 @@
}
static int
-ssif_driver_request(struct ipmi_softc *sc, struct ipmi_request *req, int timo)
+ssif_driver_request(struct ipmi_softc *sc, struct ipmi_request *req)
{
int error;
IPMI_LOCK(sc);
error = ipmi_polled_enqueue_request(sc, req);
if (error == 0)
- error = msleep(req, &sc->ipmi_requests_lock, 0, "ipmireq",
- timo);
+ error = msleep(req, &sc->ipmi_requests_lock, 0, "ipmireq", 0);
if (error == 0)
error = req->ir_error;
IPMI_UNLOCK(sc);
diff --git a/sys/dev/ipmi/ipmivars.h b/sys/dev/ipmi/ipmivars.h
--- a/sys/dev/ipmi/ipmivars.h
+++ b/sys/dev/ipmi/ipmivars.h
@@ -133,7 +133,7 @@
driver_intr_t *ipmi_intr;
int (*ipmi_startup)(struct ipmi_softc *);
int (*ipmi_enqueue_request)(struct ipmi_softc *, struct ipmi_request *);
- int (*ipmi_driver_request)(struct ipmi_softc *, struct ipmi_request *, int);
+ int (*ipmi_driver_request)(struct ipmi_softc *, struct ipmi_request *);
};
#define ipmi_ssif_smbus_address _iface.ssif.smbus_address
@@ -247,8 +247,7 @@
void ipmi_free_request(struct ipmi_request *);
int ipmi_polled_enqueue_request(struct ipmi_softc *, struct ipmi_request *);
int ipmi_polled_enqueue_request_highpri(struct ipmi_softc *, struct ipmi_request *);
-int ipmi_submit_driver_request(struct ipmi_softc *, struct ipmi_request *,
- int);
+int ipmi_submit_driver_request(struct ipmi_softc *, struct ipmi_request *);
/* Identify BMC interface via SMBIOS. */
int ipmi_smbios_identify(struct ipmi_get_info *);

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 27, 5:55 PM (3 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17820473
Default Alt Text
D47179.id145116.diff (7 KB)

Event Timeline