Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp319939pxb; Mon, 16 Aug 2021 06:15:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsIa+B59TQ9MrrE8+6amnoHJxQmrxBvG8ToPQGEJwi9oUmoKY+X5wrjuZUdUMShU3s2k+O X-Received: by 2002:a05:6402:384:: with SMTP id o4mr20573046edv.128.1629119710881; Mon, 16 Aug 2021 06:15:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629119710; cv=none; d=google.com; s=arc-20160816; b=sLVMn48ijhw1R/8YOjsZTUFOFxamQhvUgfdzLFxcQ8iHMHWqVoOrZ1OFm/t5kBAIYx Zvlcnn1Vg4KBkwdXHXNFoa0sLpg1ay7OfZZrvP5U0X94tlxSba0aC3u5zflglUqKhcwB ry0RUQfZkv+Hn9YdVvDOhXcHJf0/iclPiE5KI467FhH9h4jRaDu8n8ppsfmzSZ8/9P2v GwC8mFOx/7VI1VKoXA71lhTbt1EXb2uJiSUl0JMTO8ecrDyVINJbOImZdvubKlEary6b Pzp2xIrDpuCwPj7xzhj1phi+ngEoTsLg9WcDbGTEsXrMh7MrCtdlffS9F6CV6M0XOQz2 KKYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pMzg216byxVzew00uhWX2yCJGerQmjB+Dv8JH9D+e60=; b=Da8R1YrzHLTGOeVfjEckwEyotvcc2ONJquUNo7+yC4S+MTLkrHXhR2KUd85vJiTt6g uVGfmKwSGukfagwz/Teb79oM1RP+JqXuoPhEcAI5iXQiPsq+0b1cdGvAUFbvXMjhqj4q wyMJ01u3e23rt3LmTio4ezw61ZYus214Uo3VApXx58xyEdTMy3xsBV/2TzNa7Odzmyug 3zvsAnJuZfjZNiEDT3XOEAkDlHGWL94fT7z6goG51ESEwAaIlonws0UMYu7ATOlVuI/M G9QatSiNphi//+G+ZKymLVmf8kqaQ6FqeboW7c2VTM1ZQXMJCTM4bKjqtjNjZdV3ab9W jFqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=U990enEd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l15si9593886ejx.469.2021.08.16.06.14.47; Mon, 16 Aug 2021 06:15:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=U990enEd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239709AbhHPNM0 (ORCPT + 99 others); Mon, 16 Aug 2021 09:12:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:57542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239011AbhHPNJB (ORCPT ); Mon, 16 Aug 2021 09:09:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9FD8A632C1; Mon, 16 Aug 2021 13:07:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1629119253; bh=PmtFvciBFCHuUb4SP1I6kSWyIx07SQNLWI0/aMsPgxY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U990enEd5i8aaLIKt5qjIRRismVP8jP/RChNxMaBVBct3dHEr4vHC8yzbegNbgJ6b JjN1Y2kNIg8DUDQeceRR3qtpjP6+PJ3gJtSSKamKI8651NyXqhxLNprp08HVFkotcV 6YMFG5SG4bQG52APg6tNv9PK/L4/H5mWgfHRMhYA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Hutchings , "David S. Miller" , Sasha Levin Subject: [PATCH 5.10 51/96] net: dsa: microchip: Fix ksz_read64() Date: Mon, 16 Aug 2021 15:02:01 +0200 Message-Id: <20210816125436.659359567@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210816125434.948010115@linuxfoundation.org> References: <20210816125434.948010115@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ben Hutchings [ Upstream commit c34f674c8875235725c3ef86147a627f165d23b4 ] ksz_read64() currently does some dubious byte-swapping on the two halves of a 64-bit register, and then only returns the high bits. Replace this with a straightforward expression. Fixes: e66f840c08a2 ("net: dsa: ksz: Add Microchip KSZ8795 DSA driver") Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/microchip/ksz_common.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index cf866e48ff66..a51c716ec920 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -210,12 +210,8 @@ static inline int ksz_read64(struct ksz_device *dev, u32 reg, u64 *val) int ret; ret = regmap_bulk_read(dev->regmap[2], reg, value, 2); - if (!ret) { - /* Ick! ToDo: Add 64bit R/W to regmap on 32bit systems */ - value[0] = swab32(value[0]); - value[1] = swab32(value[1]); - *val = swab64((u64)*value); - } + if (!ret) + *val = (u64)value[0] << 32 | value[1]; return ret; } -- 2.30.2