Author: sephe
Date: Mon Apr 25 10:16:07 2016
New Revision: 298575
URL: https://svnweb.freebsd.org/changeset/base/298575
Log:
hyperv/hn: Synchronize sub-channel offers
MFC after: 1 week
Sponsored by: Microsoft OSTC
Modified:
head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
Modified: head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Mon Apr 25 09:00:06
2016 (r298574)
+++ head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Mon Apr 25 10:16:07
2016 (r298575)
@@ -421,7 +421,7 @@ static int
netvsc_attach(device_t dev)
{
struct hv_device *device_ctx = vmbus_get_devctx(dev);
- struct hv_vmbus_channel *chan;
+ struct hv_vmbus_channel *pri_chan;
netvsc_device_info device_info;
hn_softc_t *sc;
int unit = device_get_unit(dev);
@@ -502,12 +502,12 @@ netvsc_attach(device_t dev)
/*
* Associate the first TX/RX ring w/ the primary channel.
*/
- chan = device_ctx->channel;
- KASSERT(HV_VMBUS_CHAN_ISPRIMARY(chan), ("not primary channel"));
- KASSERT(chan->offer_msg.offer.sub_channel_index == 0,
+ pri_chan = device_ctx->channel;
+ KASSERT(HV_VMBUS_CHAN_ISPRIMARY(pri_chan), ("not primary channel"));
+ KASSERT(pri_chan->offer_msg.offer.sub_channel_index == 0,
("primary channel subidx %u",
- chan->offer_msg.offer.sub_channel_index));
- hn_channel_attach(sc, chan);
+ pri_chan->offer_msg.offer.sub_channel_index));
+ hn_channel_attach(sc, pri_chan);
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = hn_ioctl;
@@ -547,6 +547,19 @@ netvsc_attach(device_t dev)
error = hv_rf_on_device_add(device_ctx, &device_info, ring_cnt);
if (error)
goto failed;
+
+ if (sc->net_dev->num_channel > 1) {
+ struct hv_vmbus_channel **subchan;
+ int subchan_cnt = sc->net_dev->num_channel - 1;
+
+ /*
+ * Wait for sub-channels setup to complete.
+ */
+ subchan = vmbus_get_subchan(pri_chan, subchan_cnt);
+ vmbus_rel_subchan(subchan, subchan_cnt);
+ device_printf(dev, "%d sub-channels setup done\n", subchan_cnt);
+ }
+
KASSERT(sc->net_dev->num_channel > 0 &&
sc->net_dev->num_channel <= sc->hn_rx_ring_inuse,
("invalid channel count %u, should be less than %d",
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
