From nobody Sun May 10 20:32:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B951C433EF for ; Mon, 25 Apr 2022 07:05:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231759AbiDYHIW (ORCPT ); Mon, 25 Apr 2022 03:08:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232849AbiDYHIU (ORCPT ); Mon, 25 Apr 2022 03:08:20 -0400 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 333A81CB23 for ; Mon, 25 Apr 2022 00:05:17 -0700 (PDT) Received: by mail-pl1-x636.google.com with SMTP id d15so10509321plh.2 for ; Mon, 25 Apr 2022 00:05:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nathanrossi.com; s=google; h=date:message-id:from:to:cc:subject:content-transfer-encoding :mime-version; bh=G5sRPyebMiaK+CkKH2Wzg8i7aV0+QrCrVRBT1qhOcaI=; b=gvarVsivP2TPPQp1s7mNr2WOCLQsBnv0xBRbTwG1WzVGyS2y+du/JKIx4sCrfuF4YH PcNQiL2hI5ki5NBdy6HX2xYCg/SdnJEmfFN7kZsSczLSlHVIo+FCghmgvG7x52O+cQCz IQwEqKTvi9oIqxeY9IHsLv4LS7+tlcvvN2ZqFCwOrHCQ4T6VbnnA21aKlit+rjhnPC/z NrjfD3D/wejkBGy2F6myXSkBvEZu2fIcBp9d+euVI0IBw8J+e60BxVEjT7Xg7gHPzcWY Qcts47D+S1u0a7hwlMExteDdQ1PFjhfxhKjbaL4Zkh8gFr5MJdBS/3yICoXpDbzAm5DC hAFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:from:to:cc:subject :content-transfer-encoding:mime-version; bh=G5sRPyebMiaK+CkKH2Wzg8i7aV0+QrCrVRBT1qhOcaI=; b=n0+rrfECfE2EVQJo19EvyBDKVFzlPQvK72el7zShmVX6PXv5RWNzA6dt4XpMpdY7md cGGqvOxt7CZtxT/V9lNb3K5LSoyh8QDxV297VkBJrJ9NoAtap7y1lsLPNHmbWAOKjmL1 G5ZIBQqHrMGD4slxVkZmP0KFv92i1uTZEXzQuA5+RPUKBgrF76SUJGk9QeQQI3I+TOd1 h9o8KemZV8KYsAe/K2S76inBitG9e2d3r5SCRdFLlkMgRosGaGWyV9fJUW6m47b2MFMt cUx7XP4NHmUGDr66+Y50RhD4AdnAeuw87L/pOLSTHqSgwjJsudgRVKFbj8krJ3ZryGBP w+2Q== X-Gm-Message-State: AOAM5329w2eSLdJbCsMOqupgfxOic6ZjXt/ux1AlCa3Vrq1d394SkMCc pehGfF/Q5NbhNOTlZy97jDL4Vg== X-Google-Smtp-Source: ABdhPJz9XaphssmX1kc6CKUT43yG5iztoWC0yHVEvD8x5O7s98+J22lh+ZUuA8TgUolp2Zds6H+MIg== X-Received: by 2002:a17:902:8f86:b0:15b:4dfa:ba7b with SMTP id z6-20020a1709028f8600b0015b4dfaba7bmr16605446plo.43.1650870316700; Mon, 25 Apr 2022 00:05:16 -0700 (PDT) Received: from [127.0.1.1] (117-20-68-98.751444.bne.nbn.aussiebb.net. [117.20.68.98]) by smtp.gmail.com with UTF8SMTPSA id k15-20020a63ab4f000000b00381eef69bfbsm8685165pgp.3.2022.04.25.00.05.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 00:05:16 -0700 (PDT) Date: Mon, 25 Apr 2022 07:04:54 +0000 Message-Id: <20220425070454.348584-1-nathan@nathanrossi.com> From: Nathan Rossi To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Nathan Rossi , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , Paolo Abeni , Marek =?utf-8?q?Beh=C3=BAn?= Subject: [PATCH v3] net: dsa: mv88e6xxx: Fix port_hidden_wait to account for port_base_addr Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The other port_hidden functions rely on the port_read/port_write functions to access the hidden control port. These functions apply the offset for port_base_addr where applicable. Update port_hidden_wait to use the port_wait_bit so that port_base_addr offsets are accounted for when waiting for the busy bit to change. Without the offset the port_hidden_wait function would timeout on devices that have a non-zero port_base_addr (e.g. MV88E6141), however devices that have a zero port_base_addr would operate correctly (e.g. MV88E6390). Fixes: 609070133aff ("net: dsa: mv88e6xxx: update code operating on hidden = registers") Signed-off-by: Nathan Rossi Reviewed-by: Marek Beh=C3=BAn Reviewed-by: Andrew Lunn --- Changes in v2: - Add Fixes Changes in v3: - Changed Fixes to more recent commit where the bug is present --- drivers/net/dsa/mv88e6xxx/port_hidden.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/port_hidden.c b/drivers/net/dsa/mv88= e6xxx/port_hidden.c index b49d05f0e1..7a9f9ff6de 100644 --- a/drivers/net/dsa/mv88e6xxx/port_hidden.c +++ b/drivers/net/dsa/mv88e6xxx/port_hidden.c @@ -40,8 +40,9 @@ int mv88e6xxx_port_hidden_wait(struct mv88e6xxx_chip *chi= p) { int bit =3D __bf_shf(MV88E6XXX_PORT_RESERVED_1A_BUSY); =20 - return mv88e6xxx_wait_bit(chip, MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT, - MV88E6XXX_PORT_RESERVED_1A, bit, 0); + return mv88e6xxx_port_wait_bit(chip, + MV88E6XXX_PORT_RESERVED_1A_CTRL_PORT, + MV88E6XXX_PORT_RESERVED_1A, bit, 0); } =20 int mv88e6xxx_port_hidden_read(struct mv88e6xxx_chip *chip, int block, int= port, --- 2.35.2