From patchwork Fri Nov 1 03:46:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Sander X-Patchwork-Id: 13858678 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-yb1-f225.google.com (mail-yb1-f225.google.com [209.85.219.225]) (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 22A7413BC18 for ; Fri, 1 Nov 2024 03:48:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730432908; cv=none; b=sMsMR11ew3uraWAmtjv3nmGlHuI+X99vWmgun5dMPH6Y5hcNYuG61Hkav66hnVLvlinfuP/eEUA3kE+yKDgiw+FONG0IlB18ExgPX9RZO5iPKobDCz9QIsvToq1DmNq6sWPksbSPFyJV4rdwcUerjN36TXWChyCJsQe0azJmi/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730432908; c=relaxed/simple; bh=vb2oy9sCtacw/TXgOT7kaZXJblOW4SHOKBYJ4mHT4RA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YXqGLU8kCurkqyYGJORSm+z3g8o4qcWIYbQovGtQDJp5JHqqtrjKsrp5zBCVxPXc8L4218E71S1kKz4xUMt9Vy04vEi/BExe4JLzVFiPSSon7n6H40OuN3EZOyAuMHPd5AZrYDjHHpt1zxpHnq56HUHAJZ0TVfNDbbYNIqzWGzA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=ZzeeFI5G; arc=none smtp.client-ip=209.85.219.225 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="ZzeeFI5G" Received: by mail-yb1-f225.google.com with SMTP id 3f1490d57ef6-e291025cbc5so217714276.1 for ; Thu, 31 Oct 2024 20:48:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1730432904; x=1731037704; 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=Up78lUxvH9q9ucvQFWkY0ZlRiNJvCC25wLA/XPV5mzI=; b=ZzeeFI5Gv+utldo5Ncc9JuDW9O2ij/nWykM+hYt3eacndZW+NQ2BgmlNiNuWeyOg3z VmZ6RbAqMHKer7PLU3pANnTSi0JvOge7NAz6yU3+MOMLsOLPORib6vkZju2+ZwQam9hO EQwYMKA5/LAAuf8rlWlk1kf/LhfmHmMivG/z7x+ved8Hh3Swa4z/FuE+WOVAKSzdoTEx b6hv0YBZPQOa0kpds8oyLWvKPAWvGeA01YEZSawMCADj6w/7dB/9gHgp2zO+rJvKkWPr qTpew1XhDbvPSccrOy6RULbCI707Rk0kgJmZ4HJIqCt1RlIPGeRiMzb0926tSUFUDfLg UYuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730432904; x=1731037704; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Up78lUxvH9q9ucvQFWkY0ZlRiNJvCC25wLA/XPV5mzI=; b=p6Y/crreHJ7ATpLunG6O68q0WcFh6666GCM3eRbIcjZvM/EEVNm3LBbzltW9/eM2gv 1TVaGpSt82XfkeOyVypbkmwJFCjOJ0M1LCdAA6PknDLHhy0eUZMB5mkgTWJlm4kxpxTd bXo1QGH3TupxblBZgMO/UYfdKam30th2WQet0s1eI+ivSknrgL5iHCusFzH9pL1BpqM5 rfQ7aYOmcCQlzpd469TU9rPjd0T+YUtjtH4ReZ9w8vpkB5N0rB2oOuOs/Ar28hvTtW4I XOwr2fE2i8UBbV3JO3BccyAMVbxbI5A5RxWliNu0Q9a2WQfr22b/681ApFMkibbh+dsy pDLw== X-Forwarded-Encrypted: i=1; AJvYcCWoWMi09Z1e8OI9+wbz5nBeCCCZtAorbQhwkA03b1BpNiTtYoni3k8RQc5hUAB6jvB/bUKAyPo=@vger.kernel.org X-Gm-Message-State: AOJu0Yyu1wM0ooQ+IyO8HS9UjX1U8vXUAlKSlUdDB3A0giy4ZJvPUON1 JnV2U+cJbTKJRh1A2I057dtRX+LyUCTBb3ZzKLsPbPj8zdxQF9K8rYS1f+c0FcGya8CFtj18UmM T8bIgKXGAxlFtqJSNFY3PLErPNdqlfajCndlXZEQwKeO40TQO X-Google-Smtp-Source: AGHT+IGWZ6+2TcpibDq+QvmilpiTPyrL6xq18JN2Nx0c+o1Cryy+xInZp0VbeTqIdLLnK+T9JrTGA/dbML47 X-Received: by 2002:a05:690c:fc7:b0:6e2:ad08:492a with SMTP id 00721157ae682-6e9d8aab833mr104947587b3.5.1730432903988; Thu, 31 Oct 2024 20:48:23 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id 00721157ae682-6ea55b0cd8fsm946117b3.20.2024.10.31.20.48.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Oct 2024 20:48:23 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id A182A3406A8; Thu, 31 Oct 2024 21:48:22 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 98397E42B1D; Thu, 31 Oct 2024 21:48:22 -0600 (MDT) From: Caleb Sander Mateos To: Saeed Mahameed , Leon Romanovsky , Tariq Toukan , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Caleb Sander Mateos , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/2] mlx5/core: deduplicate {mlx5_,}eq_update_ci() Date: Thu, 31 Oct 2024 21:46:40 -0600 Message-ID: <20241101034647.51590-2-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241101034647.51590-1-csander@purestorage.com> References: <20241101034647.51590-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org The logic of eq_update_ci() is duplicated in mlx5_eq_update_ci(). The only additional work done by mlx5_eq_update_ci() is to increment eq->cons_index. Call eq_update_ci() from mlx5_eq_update_ci() to avoid the duplication. Signed-off-by: Caleb Sander Mateos --- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eq.c b/drivers/net/ethernet/mellanox/mlx5/core/eq.c index 859dcf09b770..078029c81935 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eq.c @@ -802,19 +802,12 @@ struct mlx5_eqe *mlx5_eq_get_eqe(struct mlx5_eq *eq, u32 cc) } EXPORT_SYMBOL(mlx5_eq_get_eqe); void mlx5_eq_update_ci(struct mlx5_eq *eq, u32 cc, bool arm) { - __be32 __iomem *addr = eq->doorbell + (arm ? 0 : 2); - u32 val; - eq->cons_index += cc; - val = (eq->cons_index & 0xffffff) | (eq->eqn << 24); - - __raw_writel((__force u32)cpu_to_be32(val), addr); - /* We still want ordering, just not swabbing, so add a barrier */ - wmb(); + eq_update_ci(eq, arm); } EXPORT_SYMBOL(mlx5_eq_update_ci); static void comp_irq_release_pci(struct mlx5_core_dev *dev, u16 vecidx) {