From owner-dev-commits-src-main@freebsd.org Mon Sep 27 16:34:36 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7227A66B556 for ; Mon, 27 Sep 2021 16:34:36 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HJ7Ww2f2Dz3sjH for ; Mon, 27 Sep 2021 16:34:36 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: by mail-yb1-xb2b.google.com with SMTP id u32so4613461ybd.9 for ; Mon, 27 Sep 2021 09:34:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=hxMHvxFZt9nZAp4eX+0WN7TJLO2HL7cZ5LjwJc+147s=; b=qEKZxwO2nir5rRE8A2a+OduA9e6yu97ulJmP/PJifO+SdgbkKHXK4B2gJOTfYY4/BO wMv1/ZGQad8A/ZtYN0JpGZIXKe+maGygBYU34nzMnQKsV9QoPjlu5Ne4TMnGnpWC1+Xk nygPKFv8jS5CJozHVSAO2ZIRvntPGqs9H+jd0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=hxMHvxFZt9nZAp4eX+0WN7TJLO2HL7cZ5LjwJc+147s=; b=rBG0624NmzGbUvzmFxXc6mm/qv45kdDCfzKVb+xrMVGKg5YG0e3gCwf3EjKWX/2An8 8WZ4rASuIzM08h54HHH0ouoEweH+GBKxyUN2WFUQBSkvvXnncsFmQR34JKKoYI99BS/E Fh5v0piOJdPQdpfARteQ25MzyAsZWrrBDs4SX69ItFDXyma2PXQOy0PZYtz5OF1TeGjl qLiRYp95G7k8QlXbwM7uEoUP+Af2TGXNt4r03+/1Zhnse3gGveZw8o22nx9VO8GQRTqQ kvGJzSwiRBoJQWlwHNZq5lUo6/qjUFId/nXiuzkEE69uLefpr0CcwSvaUrrswZZjKrYo CUUg== X-Gm-Message-State: AOAM531rI0l24NibJtMw7CJwNxR2R4ouE8gDsFgMnXmzrK9qoD7XGdfw oAzL7pNA02rb2PxvAwDRcOAgqu1tDG+jAbxKI1dAPw== X-Google-Smtp-Source: ABdhPJzfl9XqiwOckKN15TC7DGZxTpIzUYyxX5JIs7GiHs5WzADbx2+RgMI+kwPfgTZLOHjTiAYJQW0M0vfQQcni7ow= X-Received: by 2002:a5b:cd0:: with SMTP id e16mr816000ybr.533.1632760469862; Mon, 27 Sep 2021 09:34:29 -0700 (PDT) MIME-Version: 1.0 References: <202109271629.18RGTeOG074870@gitrepo.freebsd.org> In-Reply-To: <202109271629.18RGTeOG074870@gitrepo.freebsd.org> From: Kevin Bowling Date: Mon, 27 Sep 2021 09:34:18 -0700 Message-ID: Subject: Re: git: 450c3f8b3d25 - main - e1000: Re-arm link changes To: Kevin Bowling Cc: src-committers , "" , "dev-commits-src-main@FreeBSD.org" Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4HJ7Ww2f2Dz3sjH X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Sep 2021 16:34:36 -0000 On Mon, Sep 27, 2021 at 9:29 AM Kevin Bowling wrote: > > The branch main has been updated by kbowling (ports committer): > > URL: https://cgit.FreeBSD.org/src/commit/?id=450c3f8b3d259c7eb82488319aff45f1f6554aaf > > commit 450c3f8b3d259c7eb82488319aff45f1f6554aaf > Author: Kevin Bowling > AuthorDate: 2021-09-27 16:17:48 +0000 > Commit: Kevin Bowling > CommitDate: 2021-09-27 16:25:58 +0000 > > e1000: Re-arm link changes > > A change to MSI-X link handler was somehow causing issues on > MSI-based em(4) NICs. If anyone has any deeper insight here, I'd like to fill in my knowledge. A 'device_printf' in 'em_msix_link()' never fires on em(4) using MSI so I do not see the relationship between this code and the experienced issues. > Revert the change based on user reports and testing. > > PR: 258551 > Reported by: Franco Fichtner , t_uemura@macome.co.jp > Reviewed by: markj, Franco Fichtner > Tested by: t_uemura@macome.co.jp > MFC after: 1 day > --- > sys/dev/e1000/if_em.c | 22 ++++++---------------- > 1 file changed, 6 insertions(+), 16 deletions(-) > > diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c > index 47513c5d9e1e..34d7b8f5f87e 100644 > --- a/sys/dev/e1000/if_em.c > +++ b/sys/dev/e1000/if_em.c > @@ -1495,7 +1495,6 @@ em_msix_link(void *arg) > { > struct e1000_softc *sc = arg; > u32 reg_icr; > - bool notlink = false; > > ++sc->link_irq; > MPASS(sc->hw.back != NULL); > @@ -1506,17 +1505,14 @@ em_msix_link(void *arg) > > if (reg_icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) > em_handle_link(sc->ctx); > - else > - notlink = true; > > - /* Re-arm for other/spurious interrupts */ > - if (notlink && sc->hw.mac.type >= igb_mac_min) { > + /* Re-arm unconditionally */ > + if (sc->hw.mac.type >= igb_mac_min) { > E1000_WRITE_REG(&sc->hw, E1000_IMS, E1000_IMS_LSC); > E1000_WRITE_REG(&sc->hw, E1000_EIMS, sc->link_mask); > } else if (sc->hw.mac.type == e1000_82574) { > - if (notlink) > - E1000_WRITE_REG(&sc->hw, E1000_IMS, E1000_IMS_LSC | > - E1000_IMS_OTHER); > + E1000_WRITE_REG(&sc->hw, E1000_IMS, E1000_IMS_LSC | > + E1000_IMS_OTHER); > /* > * Because we must read the ICR for this interrupt it may > * clear other causes using autoclear, for this reason we > @@ -1524,7 +1520,8 @@ em_msix_link(void *arg) > */ > if (reg_icr) > E1000_WRITE_REG(&sc->hw, E1000_ICS, sc->ims); > - } > + } else > + E1000_WRITE_REG(&sc->hw, E1000_IMS, E1000_IMS_LSC); > > return (FILTER_HANDLED); > } > @@ -1873,13 +1870,6 @@ em_if_update_admin_status(if_ctx_t ctx) > > if (hw->mac.type < em_mac_min) > lem_smartspeed(sc); > - else if (hw->mac.type >= igb_mac_min && > - sc->intr_type == IFLIB_INTR_MSIX) { > - E1000_WRITE_REG(&sc->hw, E1000_IMS, E1000_IMS_LSC); > - E1000_WRITE_REG(&sc->hw, E1000_EIMS, sc->link_mask); > - } else if (hw->mac.type == e1000_82574 && > - sc->intr_type == IFLIB_INTR_MSIX) > - E1000_WRITE_REG(hw, E1000_IMS, E1000_IMS_LSC | E1000_IMS_OTHER); > } > > static void > _______________________________________________ > dev-commits-src-main@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main > To unsubscribe, send any mail to "dev-commits-src-main-unsubscribe@freebsd.org"