sync with OpenBSD -current
This commit is contained in:
parent
de73a2419b
commit
e9d0cc1e24
GPG key ID:
F42C07F07E2E35B7
53 changed files with 145 additions and 129 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: auixp.c,v 1.54 2024/08/18 14:42:56 deraadt Exp $ */
|
||||
/* $OpenBSD: auixp.c,v 1.56 2024/09/20 02:20:44 jsg Exp $ */
|
||||
/* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -145,7 +145,7 @@ void auixp_dma_update(struct auixp_softc *, struct auixp_dma *);
|
|||
void auixp_update_busbusy(struct auixp_softc *);
|
||||
|
||||
#ifdef DEBUG_AUIXP
|
||||
#define DPRINTF(x) printf x;
|
||||
#define DPRINTF(x) printf x
|
||||
#else
|
||||
#define DPRINTF(x)
|
||||
#endif
|
||||
|
|
@ -370,7 +370,7 @@ auixp_malloc(void *hdl, int direction, size_t size, int pool, int flags)
|
|||
}
|
||||
SLIST_INSERT_HEAD(&sc->sc_dma_list, dma, dma_chain);
|
||||
|
||||
DPRINTF(("auixp_malloc: returning kern %p, hw 0x%08x for %d bytes "
|
||||
DPRINTF(("auixp_malloc: returning kern %p, hw 0x%08x for %zu bytes "
|
||||
"in %d segs\n", KERNADDR(dma), (u_int32_t) DMAADDR(dma), dma->size,
|
||||
dma->nsegs)
|
||||
);
|
||||
|
|
@ -1383,7 +1383,7 @@ auixp_reset_aclink(struct auixp_softc *sc)
|
|||
|
||||
/* have to wait at least 10 usec for it to initialise */
|
||||
DELAY(20);
|
||||
};
|
||||
}
|
||||
|
||||
printf("%s: soft resetting aclink\n", sc->sc_dev.dv_xname);
|
||||
|
||||
|
|
@ -1427,15 +1427,15 @@ auixp_reset_aclink(struct auixp_softc *sc)
|
|||
|
||||
timeout--;
|
||||
if (timeout == 0) break;
|
||||
};
|
||||
}
|
||||
|
||||
if (timeout == 0) {
|
||||
printf("%s: giving up aclink reset\n", sc->sc_dev.dv_xname);
|
||||
};
|
||||
}
|
||||
if (timeout != 10) {
|
||||
printf("%s: aclink hardware reset successful\n",
|
||||
sc->sc_dev.dv_xname);
|
||||
};
|
||||
}
|
||||
|
||||
/* assert reset and sync for safety */
|
||||
value = bus_space_read_4(iot, ioh, ATI_REG_CMD);
|
||||
|
|
|
|||
|
|
@ -796,7 +796,7 @@ void DCP_FW_NAME(iomfb_poweron)(struct apple_dcp *dcp)
|
|||
struct dcp_wait_cookie *cookie;
|
||||
int ret;
|
||||
u32 handle;
|
||||
dev_err(dcp->dev, "dcp_poweron() starting\n");
|
||||
dev_info(dcp->dev, "dcp_poweron() starting\n");
|
||||
|
||||
cookie = kzalloc(sizeof(*cookie), GFP_KERNEL);
|
||||
if (!cookie)
|
||||
|
|
@ -938,7 +938,7 @@ void DCP_FW_NAME(iomfb_poweroff)(struct apple_dcp *dcp)
|
|||
|
||||
kref_put(&poff_cookie->refcount, release_wait_cookie);
|
||||
|
||||
dev_err(dcp->dev, "dcp_poweroff() done\n");
|
||||
dev_info(dcp->dev, "dcp_poweroff() done\n");
|
||||
}
|
||||
|
||||
static void last_client_closed_sleep(struct apple_dcp *dcp, void *out, void *cookie)
|
||||
|
|
@ -983,7 +983,7 @@ void DCP_FW_NAME(iomfb_sleep)(struct apple_dcp *dcp)
|
|||
dev_warn(dcp->dev, "setDCPPower(0) timeout %u ms\n", 1000);
|
||||
|
||||
kref_put(&cookie->refcount, release_wait_cookie);
|
||||
dev_err(dcp->dev, "dcp_sleep() done\n");
|
||||
dev_info(dcp->dev, "dcp_sleep() done\n");
|
||||
}
|
||||
|
||||
static void dcpep_cb_hotplug(struct apple_dcp *dcp, u64 *connected)
|
||||
|
|
|
|||
|
|
@ -2165,7 +2165,6 @@ static int initialize_hdcp_port_data(struct intel_connector *connector,
|
|||
struct intel_digital_port *dig_port,
|
||||
const struct intel_hdcp_shim *shim)
|
||||
{
|
||||
STUB();
|
||||
return -ENOSYS;
|
||||
#ifdef notyet
|
||||
struct drm_i915_private *i915 = to_i915(connector->base.dev);
|
||||
|
|
@ -2225,7 +2224,6 @@ void intel_hdcp_component_init(struct drm_i915_private *i915)
|
|||
if (!is_hdcp2_supported(i915))
|
||||
return;
|
||||
|
||||
STUB();
|
||||
#ifdef notyet
|
||||
mutex_lock(&i915->display.hdcp.hdcp_mutex);
|
||||
drm_WARN_ON(&i915->drm, i915->display.hdcp.comp_added);
|
||||
|
|
|
|||
|
|
@ -2274,7 +2274,7 @@ inteldrm_attach(struct device *parent, struct device *self, void *aux)
|
|||
& (PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE))
|
||||
== (PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE)) {
|
||||
dev_priv->primary = 1;
|
||||
dev_priv->console = vga_is_console(pa->pa_iot, -1);;
|
||||
dev_priv->console = vga_is_console(pa->pa_iot, -1);
|
||||
vga_console_attached = 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_ngbe.c,v 1.5 2024/05/24 06:02:56 jsg Exp $ */
|
||||
/* $OpenBSD: if_ngbe.c,v 1.6 2024/09/20 02:15:53 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2015-2017 Beijing WangXun Technology Co., Ltd.
|
||||
|
|
@ -1707,7 +1707,7 @@ ngbe_initialize_transmit_unit(struct ngbe_softc *sc)
|
|||
struct tx_ring *txr;
|
||||
uint64_t tdba;
|
||||
uint32_t txdctl;
|
||||
int i, wait_loop = NGBE_MAX_RX_DESC_POLL;;
|
||||
int i, wait_loop = NGBE_MAX_RX_DESC_POLL;
|
||||
int error = 0;
|
||||
|
||||
/* TDM_CTL.TE must be before Tx queues are enabled */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: maestro.c,v 1.55 2024/09/04 07:54:52 mglocker Exp $ */
|
||||
/* $OpenBSD: maestro.c,v 1.56 2024/09/20 02:00:46 jsg Exp $ */
|
||||
/* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */
|
||||
/*
|
||||
* FreeBSD's ESS Agogo/Maestro driver
|
||||
|
|
@ -627,7 +627,7 @@ maestro_attach(struct device *parent, struct device *self, void *aux)
|
|||
0, &sc->iot, &sc->ioh, NULL, NULL, 0)) != 0) {
|
||||
printf(", can't map i/o space\n");
|
||||
goto bad;
|
||||
};
|
||||
}
|
||||
|
||||
/* Allocate fixed DMA segment :-( */
|
||||
sc->dmasize = MAESTRO_BUFSIZ * 16;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: virtio_pci.c,v 1.42 2024/09/02 08:26:26 sf Exp $ */
|
||||
/* $OpenBSD: virtio_pci.c,v 1.43 2024/09/19 06:19:05 sf Exp $ */
|
||||
/* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -284,7 +284,7 @@ virtio_pci_setup_intrs(struct virtio_softc *vsc)
|
|||
if (sc->sc_irq_type == IRQ_NO_MSIX)
|
||||
return;
|
||||
|
||||
for (i = 0; i <= vsc->sc_nvqs; i++) {
|
||||
for (i = 0; i < vsc->sc_nvqs; i++) {
|
||||
unsigned vec = vsc->sc_vqs[i].vq_intr_vec;
|
||||
virtio_pci_set_msix_queue_vector(sc, i, vec);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: vmwpvs.c,v 1.29 2024/09/04 07:54:52 mglocker Exp $ */
|
||||
/* $OpenBSD: vmwpvs.c,v 1.30 2024/09/20 02:00:46 jsg Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2013 David Gwynne <dlg@openbsd.org>
|
||||
|
|
@ -799,7 +799,7 @@ vmwpvs_msg_task(void *xsc)
|
|||
printf("%s: error probing target %d lun %d\n",
|
||||
DEVNAME(sc), letoh32(dvmsg->target),
|
||||
dvmsg->lun[1]);
|
||||
};
|
||||
}
|
||||
break;
|
||||
|
||||
case VMWPVS_MSG_T_REMOVED:
|
||||
|
|
@ -817,7 +817,7 @@ vmwpvs_msg_task(void *xsc)
|
|||
printf("%s: error detaching target %d lun %d\n",
|
||||
DEVNAME(sc), letoh32(dvmsg->target),
|
||||
dvmsg->lun[1]);
|
||||
};
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue