From patchwork Tue Nov 10 15:51:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 542502 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9F59F141408 for ; Wed, 11 Nov 2015 02:51:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre_com.20150623.gappssmtp.com header.i=@baylibre_com.20150623.gappssmtp.com header.b=x72lq+76; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753993AbbKJPvm (ORCPT ); Tue, 10 Nov 2015 10:51:42 -0500 Received: from mail-wm0-f46.google.com ([74.125.82.46]:34120 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752726AbbKJPvk (ORCPT ); Tue, 10 Nov 2015 10:51:40 -0500 Received: by wmvv187 with SMTP id v187so14713176wmv.1 for ; Tue, 10 Nov 2015 07:51:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre_com.20150623.gappssmtp.com; s=20150623; h=from:subject:to:cc:organization:message-id:date:user-agent :mime-version:content-type:content-transfer-encoding; bh=lDJJB/wYYf8/+uUqvHJ7s7pgYfj9zJF1gzTFLSG+UXs=; b=x72lq+76RzbQ4e4eO3yBOz9B8nmA2geyyvG5Pzcot0FSrIE/b9HCAKmPZgVZwWraaa +eld7Ivr+2ZdBGpeRCqDG8R4hFe3QN2OXv2F57hioqqGwgPhLgf5SFpKXWyoGBpQLTn1 GRPKjGvRlWvcCX4zm5TZVB00nUucqlop6E2j8JeNtMWF+HJoIbAvgZ/JT3G70kumBDtC rSF2vz4zgU0lU5nQOVsrnfeZL3JCTk2KD9wUv2QosCmOVqgPn9LSmMVl0XdPxp9mGzbS 4wzoVg2jTiSjGNlPlLbUUrnpNazYA2YAIkjCjAdwmQeAnl8tpWMpLBeDTsDOWs2lYCeT rWhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:cc:organization:message-id:date :user-agent:mime-version:content-type:content-transfer-encoding; bh=lDJJB/wYYf8/+uUqvHJ7s7pgYfj9zJF1gzTFLSG+UXs=; b=E4zrjLSLs3jUlGQhdtP3Wkd7v/YiE/ZRrxcN+eZZ+XmkFIdVlRfpv2N7DCYiW14BVR praCEGvgnCsxTaXnyMtEbun1qGca+Z5J1uLrbzpmX8zjayyz8Mp/STvXFHILkSvlUY/f Pj9Yo4LfF57kLMKMLZhSGrRXCxkwlc5WKHpAz22aOZ5ufz8qz8hPG2qIwtYZU0Gsplxb DYiuTezMoZis4QZS/b+zUn+5p9ZfMoFefF5NDZuUfqo0mqZFkuK7lqLlNmpulrV3PezH /nTXlxgn11RQ73IEYtOL4wXoz/fBqam4mWO3OrQAphH2cZ15w00Pir1cZpceC4NMjtNy wx/g== X-Gm-Message-State: ALoCoQk+/zb222aq+AQOPitT85ri7ZyiX+6u4Tn84Xg2wSRPHQWrI8w9ym6B+haBTwl80fnSKTgU X-Received: by 10.28.55.200 with SMTP id e191mr34987189wma.75.1447170699434; Tue, 10 Nov 2015 07:51:39 -0800 (PST) Received: from [192.168.1.21] ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id m135sm22782760wmb.0.2015.11.10.07.51.38 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Nov 2015 07:51:38 -0800 (PST) From: Neil Armstrong Subject: [PATCH v2 4/6] net: dsa: mv88e6060: use the correct bit shift for mac0 To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S. Miller" , Florian Fainelli , Andrew Lunn , Guenter Roeck , Neil Armstrong , Vivien Didelot Organization: Baylibre Message-ID: <56421284.1040105@baylibre.com> Date: Tue, 10 Nov 2015 16:51:32 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org According to the mv88e6060 datasheet, the first mac byte must be at position 9 instead of 8 since the bit 8 is used to select if the mac address must differ for each port for Pause frames. Use the correct shift and set the same mac address for all port. Acked-by: Andrew Lunn Signed-off-by: Neil Armstrong --- drivers/net/dsa/mv88e6060.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c index 10647ad..cd08079 100644 --- a/drivers/net/dsa/mv88e6060.c +++ b/drivers/net/dsa/mv88e6060.c @@ -188,7 +188,8 @@ static int mv88e6060_setup(struct dsa_switch *ds) static int mv88e6060_set_addr(struct dsa_switch *ds, u8 *addr) { - REG_WRITE(REG_GLOBAL, 0x01, (addr[0] << 8) | addr[1]); + /* Use the same MAC Address as FD Pause frames for all ports */ + REG_WRITE(REG_GLOBAL, 0x01, (addr[0] << 9) | addr[1]); REG_WRITE(REG_GLOBAL, 0x02, (addr[2] << 8) | addr[3]); REG_WRITE(REG_GLOBAL, 0x03, (addr[4] << 8) | addr[5]);