From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22BA73C1402 for ; Tue, 30 Jun 2026 04:16:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782793006; cv=none; b=bb0Ag8u1osnWPV7vqtEyJxLGURipqhhxxk6axP9wqsNYyKrEKfFkAtXsCkX00HmwIzY5jHmpsKJDKFgTlZY41xKN/KILgw/ghPtgYUhaL2qIwemvPs0yBR8rQ7C+yq5d8w9TqIoYZh6XxHqDH/dN2MD0pur+jUO1xQE7nv7VPdU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782793006; c=relaxed/simple; bh=fAE/Yewa3SEx/YXCLqWkzo3ukPRxfK2v9eAkdxfVFss=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kiEzO5E0AEPep3NkwL5pmXCSSLUVECmxPPAwH5q2zoOKxVQfjs0l00NsawSal1ja1hjdzEIlNXn0TqAtfx9Jdh+dQF0GoDG3JXPUjKc7dVEmXhVvgAZR4QnPYSiMRN1QEyEUE6SNqjuE5hksHJtO1ZWzyIFrTlUH1XOfB5dc1pc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ddWppg6u; arc=none smtp.client-ip=209.85.215.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ddWppg6u" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-c969ad04c1dso749061a12.0 for ; Mon, 29 Jun 2026 21:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782793003; x=1783397803; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9nTeOTK7sT3w/yJG7JB2mC3o0CF3LaN7DeafntRCirY=; b=ddWppg6utQnm7p2iS/LHQ39U1NtWIaO4VCk5tCKK4fJyD8DU6mS56uzCSQKI9H2NG6 iQcJaLkSVuT3eSTGHtgQvbYEpdsjl39LlwU8kPG+tXXhQTfTk1wbL+BZ5CdsAwuFugO+ oRk6Fuz0QLD5ydOCKpmXTXXjNmC0WoIeYPZXGBOil4jPxGK6mEt1k5suZQ5iDmZRZpO/ +g6mQsZul3qRgRSdPIbgsTFamOxUYFNrPfcrOwAAYXFMnueEqAmG04I5Il480l2o/RL4 gfP9mnRH7d2ruLyljEfpYRIumTCRwAJIvm1vBD+QZGG6F5vxDfgLi8g9l6JpRMGIF0sE Au7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782793003; x=1783397803; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9nTeOTK7sT3w/yJG7JB2mC3o0CF3LaN7DeafntRCirY=; b=rpVBgbNvq8kh8szpEArLi489nfaAYbcXjthcWKYxOSpPcbXcBdXfyBHQkCCc9P0OCM VKqbh4ba3h+DO01gKnU/zFdmAujXdFhUt7pjlC7ORiY40G1FjTSGB0UvEhE/hw0LND9M rmuFHBfMZOLQlkVqtQHmestWfKWfWWuWbsLEhbkMAG1vm5LtkugK2kVSOAPgUUtalMIO TV6EUlz2hzCkEC4Aj62qy+dOMMQ5CYUoLT0G10fuqFxOT3DCBsXYdRqrhsNIM74WA0yZ LajRx5CfnIZkGqo22w4N9zKN9427s3faYu7ySqLEtdFgRqVFtg+/ldNi81GeddR3e3Lv 8RXQ== X-Forwarded-Encrypted: i=1; AFNElJ+jldZmhQMm5SzlyTZe2ZzJ1NnY1x3cy2oewPbGgd218v/V34J10Ur+ofKxpFS+v3WbotMqZKQ7ottKGNc=@vger.kernel.org X-Gm-Message-State: AOJu0YzeswS1+W/hugY4UOuiIfVo/E8lIFwCpr5kt0NPPFxf1/UfA+Dc LOem1LJazCzE67e8UAKLz1RU7780J/FFk1GgacAWsOo0pD0VQibx+j+F X-Gm-Gg: AfdE7ckK0HpWUhtGh+do8bg3DQxHATfBINKBwRQ2CUb0/7Qvx3oyU8WO8YAKTm5g3A0 d4YxKZlewLdx78ESA5Lc+zx0DGR5hBCKrAskz5ddHhzpkGd3eJVC1YSi2soTM4sj0ePs3goDrXM AgQjV7pUd8lpUa/hfPHJpXl+Eo/hGg0EqIW5Xh1q+0hVk7nrMLcxsG1d4oD/rTgJQidpPcfsaQr 8ssWHlAZk6BR2SkiKDRsPYRUObvG3GLLLx+ONgWgNdYb2Ue1o/M/bHRI4VLxtSKPcmwPoV8Bsfz y1JAhSB8tWJWD2ntBTQ+D+t9N75CL7Fvg0ZBIB8yjPSJ0fXJaonksS0mk4dItKeno7csN7DC3mo 4D5dkL06yhOjOX11+rjhKdDjUaQCSk3f0AEgvpFU+1yGrNClXMpBGt8gwzkb2y+e+snd3Yly2Zw BagMVGiGP2SnG6FUDpjqTgfMai4RFqBSn03Gs5B2CTxp4cLNgt0rerDT71OPFQM/4M9Mp6+0r3X 1sB92TNng== X-Received: by 2002:a05:6a21:4584:b0:3bf:6c08:fb9a with SMTP id adf61e73a8af0-3bfc547ed4emr2110881637.60.1782793003241; Mon, 29 Jun 2026 21:16:43 -0700 (PDT) Received: from ryzen.lan ([2601:644:8000:7a86::e34]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c9bbf95a3e7sm702659a12.19.2026.06.29.21.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2026 21:16:42 -0700 (PDT) From: Rosen Penev To: netdev@vger.kernel.org Cc: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 05/10] net: emac: mal: replace busy-wait in mal_poll_disable with wait_event Date: Mon, 29 Jun 2026 21:16:29 -0700 Message-ID: <20260630041634.284127-6-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260630041634.284127-1-rosenp@gmail.com> References: <20260630041634.284127-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace the msleep(1) busy-wait loop in mal_poll_disable() with a proper wait_event/wake_up mechanism. Add wait_queue_head_t to struct mal_commac, initialize it in mal_poll_add(), and wake waiters in mal_poll_enable(). Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/net/ethernet/ibm/emac/mal.c | 7 +++++-- drivers/net/ethernet/ibm/emac/mal.h | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ibm/emac/mal.c b/drivers/net/ethernet/ibm/emac/mal.c index 82d502d576ee..d12a376f69fd 100644 --- a/drivers/net/ethernet/ibm/emac/mal.c +++ b/drivers/net/ethernet/ibm/emac/mal.c @@ -176,6 +176,8 @@ void mal_poll_add(struct mal_instance *mal, struct mal_commac *commac) MAL_DBG(mal, "poll_add(%p)" NL, commac); + init_waitqueue_head(&commac->poll_wait); + /* starts disabled */ set_bit(MAL_COMMAC_POLL_DISABLED, &commac->flags); @@ -371,8 +373,8 @@ static irqreturn_t mal_int(int irq, void *dev_instance) void mal_poll_disable(struct mal_instance *mal, struct mal_commac *commac) { /* Spinlock-type semantics: only one caller disable poll at a time */ - while (test_and_set_bit(MAL_COMMAC_POLL_DISABLED, &commac->flags)) - msleep(1); + wait_event(commac->poll_wait, + !test_and_set_bit(MAL_COMMAC_POLL_DISABLED, &commac->flags)); /* Synchronize with the MAL NAPI poller */ napi_synchronize(&mal->napi); @@ -382,6 +384,7 @@ void mal_poll_enable(struct mal_instance *mal, struct mal_commac *commac) { smp_wmb(); clear_bit(MAL_COMMAC_POLL_DISABLED, &commac->flags); + wake_up(&commac->poll_wait); /* Feels better to trigger a poll here to catch up with events that * may have happened on this channel while disabled. It will most diff --git a/drivers/net/ethernet/ibm/emac/mal.h b/drivers/net/ethernet/ibm/emac/mal.h index e0ddc41186a2..bd52bb41adee 100644 --- a/drivers/net/ethernet/ibm/emac/mal.h +++ b/drivers/net/ethernet/ibm/emac/mal.h @@ -19,6 +19,8 @@ #ifndef __IBM_NEWEMAC_MAL_H #define __IBM_NEWEMAC_MAL_H +#include + /* * There are some variations on the MAL, we express them in this driver as * MAL Version 1 and 2 though that doesn't match any IBM terminology. @@ -172,6 +174,7 @@ struct mal_commac { void *dev; struct list_head poll_list; long flags; + wait_queue_head_t poll_wait; #define MAL_COMMAC_RX_STOPPED 0 #define MAL_COMMAC_POLL_DISABLED 1 u32 tx_chan_mask; -- 2.54.0