 @@ -1,36 +1,36 @@
-/* $NetBSD: mpii.c,v 1.8 2016/05/02 19:18:29 christos Exp $ */
+/* $NetBSD: mpii.c,v 1.8.10.1 2018/06/09 14:32:52 martin Exp $ */
 /*	OpenBSD: mpii.c,v 1.51 2012/04/11 13:29:14 naddy Exp 	*/
 /*
  * Copyright (c) 2010 Mike Belopuhov <mkb@crypt.org.ru>
  * Copyright (c) 2009 James Giannoules
  * Copyright (c) 2005 - 2010 David Gwynne <dlg@openbsd.org>
  * Copyright (c) 2005 - 2010 Marco Peereboom <marco@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.8 2016/05/02 19:18:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.8.10.1 2018/06/09 14:32:52 martin Exp $");
 #include "bio.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
 #include <sys/dkio.h>
 @@ -3424,46 +3424,54 @@ mpii_event_raid(struct mpii_softc *sc, s
 	ce = (struct mpii_evt_ir_cfg_element *)(ccl + 1);
 	for (i = 0; i < ccl->num_elements; i++, ce++) {
 		type = (le16toh(ce->element_flags) &
 		    MPII_EVT_IR_CFG_ELEMENT_TYPE_MASK);
 		switch (type) {
 		case MPII_EVT_IR_CFG_ELEMENT_TYPE_VOLUME:
 			switch (ce->reason_code) {
 			case MPII_EVT_IR_CFG_ELEMENT_RC_ADDED:
 			case MPII_EVT_IR_CFG_ELEMENT_RC_VOLUME_CREATED:
 				if (mpii_find_dev(sc,
 				    le16toh(ce->vol_dev_handle))) {
-					printf("%s: device %#x is already "
+					aprint_error_dev(sc->sc_dev,
-					    "configured\n", DEVNAME(sc),
+					    "device %#x is already "
 					    "configured\n",
 					    le16toh(ce->vol_dev_handle));
 					break;
+				}
 				dev = malloc(sizeof(*dev), M_DEVBUF,
 				    M_NOWAIT | M_ZERO);
 				if (!dev) {
-					printf("%s: failed to allocate a "
+					aprint_error_dev(sc->sc_dev,
-				    	    "device structure\n", DEVNAME(sc));
+					    "can't allocate device structure\n");
 					break;
+				}
 				SET(dev->flags, MPII_DF_VOLUME);
 				dev->slot = sc->sc_vd_id_low;
 				dev->dev_handle = le16toh(ce->vol_dev_handle);
 				if (mpii_insert_dev(sc, dev)) {
 					aprint_error_dev(sc->sc_dev,
 					    "can't insert device structure\n");
 					free(dev, M_DEVBUF);
 					break;
+				}
 				if (mpii_cache_enable(sc, dev)) {
 					aprint_error_dev(sc->sc_dev,
 					    "can't enable device cache\n");
 					free(dev, M_DEVBUF);
 					break;
+				}
 				mpii_cache_enable(sc, dev);
 				sc->sc_vd_count++;
 				break;
 			case MPII_EVT_IR_CFG_ELEMENT_RC_REMOVED:
 			case MPII_EVT_IR_CFG_ELEMENT_RC_VOLUME_DELETED:
 				if (!(dev = mpii_find_dev(sc,
 				    le16toh(ce->vol_dev_handle))))
 					break;
 				mpii_remove_dev(sc, dev);
 				sc->sc_vd_count--;
 				break;
+			}
 			break;
 		case MPII_EVT_IR_CFG_ELEMENT_TYPE_VOLUME_DISK:
 @@ -3505,64 +3513,66 @@ mpii_event_sas(struct mpii_softc *sc, st
 	int				i;
 	tcl = (struct mpii_evt_sas_tcl *)(enp + 1);
 	if (tcl->num_entries == 0)
 		return;
 	pe = (struct mpii_evt_phy_entry *)(tcl + 1);
 	for (i = 0; i < tcl->num_entries; i++, pe++) {
 		switch (pe->phy_status & MPII_EVENT_SAS_TOPO_PS_RC_MASK) {
 		case MPII_EVENT_SAS_TOPO_PS_RC_ADDED:
 			if (mpii_find_dev(sc, le16toh(pe->dev_handle))) {
-				printf("%s: device %#x is already "
+				aprint_error_dev(sc->sc_dev,
-				    "configured\n", DEVNAME(sc),
+				    "device %#x is already configured\n",
 				    le16toh(pe->dev_handle));
 				break;
+			}
 			dev = malloc(sizeof(*dev), M_DEVBUF, M_NOWAIT | M_ZERO);
 			if (!dev) {
-				printf("%s: failed to allocate a "
+				aprint_error_dev(sc->sc_dev, "can't allocate "
-				    "device structure\n", DEVNAME(sc));
+				    "device structure\n");
 				break;
+			}
 			dev->slot = sc->sc_pd_id_start + tcl->start_phy_num + i;
 			dev->dev_handle = le16toh(pe->dev_handle);
 			dev->phy_num = tcl->start_phy_num + i;
 			if (tcl->enclosure_handle)
 				dev->physical_port = tcl->physical_port;
 			dev->enclosure = le16toh(tcl->enclosure_handle);
 			dev->expander = le16toh(tcl->expander_handle);
 			if (mpii_insert_dev(sc, dev)) {
 				aprint_error_dev(sc->sc_dev, "can't insert "
 				    "device structure\n");
 				free(dev, M_DEVBUF);
 				break;
+			}
 			break;
 		case MPII_EVENT_SAS_TOPO_PS_RC_MISSING:
 			if (!(dev = mpii_find_dev(sc,
 			    le16toh(pe->dev_handle))))
 				break;
 			mpii_remove_dev(sc, dev);
 #if 0
 			if (sc->sc_scsibus) {
 				SET(dev->flags, MPII_DF_DETACH);
 				scsi_activate(sc->sc_scsibus, dev->slot, -1,
 				    DVACT_DEACTIVATE);
 				if (scsi_task(mpii_event_defer, sc,
 				    dev, 0) != 0)
-					printf("%s: unable to run device "
+					aprint_error_dev(sc->sc_dev,
-					    "detachment routine\n",
+					    "unable to run device "
-					    DEVNAME(sc));
+					    "detachment routine\n");
+			}
 #else
 			mpii_event_defer(sc, dev);
 #endif /* XXX */
 			break;
+		}
+	}
+}
 static void
 mpii_event_process(struct mpii_softc *sc, struct mpii_rcb *rcb)
+{
 	struct mpii_msg_event_reply		*enp;
 @@ -4969,27 +4979,27 @@ mpii_cache_enable(struct mpii_softc *sc,
  	struct mpii_msg_raid_action_reply *rep;
 	struct mpii_cfg_hdr hdr;
 	struct mpii_ccb	*ccb;
 	u_int32_t addr = MPII_CFG_RAID_VOL_ADDR_HANDLE | dev->dev_handle;
 	size_t pagelen;
 	int rv = 0;
 	int enabled;
 	if (mpii_req_cfg_header(sc, MPII_CONFIG_REQ_PAGE_TYPE_RAID_VOL, 0,
 	    addr, MPII_PG_POLL, &hdr) != 0)
 		return (EINVAL);
 	pagelen = hdr.page_length * 4;
-	vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_CANFAIL | M_ZERO);
+	vpg = malloc(pagelen, M_TEMP, M_NOWAIT | M_ZERO);
 	if (vpg == NULL)
 		return (ENOMEM);
 	if (mpii_req_cfg_page(sc, addr, MPII_PG_POLL, &hdr, 1,
 	    vpg, pagelen) != 0) {
 		rv = EINVAL;
 		goto done;
 		free(vpg, M_TEMP);
 		return (EINVAL);
+	}
 	enabled = ((le16toh(vpg->volume_settings) &
 	    MPII_CFG_RAID_VOL_0_SETTINGS_CACHE_MASK) ==