From patchwork Tue Nov 10 13:25:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 542284 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 8B16114016A for ; Wed, 11 Nov 2015 00:26:37 +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=D4/V/AM2; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753254AbbKJNZi (ORCPT ); Tue, 10 Nov 2015 08:25:38 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:37528 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753190AbbKJNZe (ORCPT ); Tue, 10 Nov 2015 08:25:34 -0500 Received: by wmww144 with SMTP id w144so541420wmw.0 for ; Tue, 10 Nov 2015 05:25:33 -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=cL16GyYmEaUG4+h9fqkDCS2Cb9ZPQl8oP5QkjckzC2Q=; b=D4/V/AM24kUgxOhzngrwogs/GuzFlujrenyPYrmFA+nr5pQnir562gXrHNlXf6OcuA 4sKaT+E7EvIGGLy0cX/fUzDIR/ivuhLwUO4waeKFO2A7eBbxesJuS+9tJeNc06VYtSzx d30hX58R9N2ePvU8gC2CQZW1jdQQJB9lP3J7b0hevROhj9D4gOfFN6kVN5HzDFD+/h0z BW+nPuxPSBqxJUEGQEnfVf8gmheeiCJ6ALYxBv6GDIhGpaFMoVQSGuCbNvUodxSm/lJ+ 6OWa6XwyGo3fxm+ndLfAXNV2L7EWAkdIuwKPqwc+R7TSaSRM9s9WShTiIIVtdzbZSqrj MLgA== 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=cL16GyYmEaUG4+h9fqkDCS2Cb9ZPQl8oP5QkjckzC2Q=; b=RTYUjAbcRX78VlmcGOHPTcmegDpO29LXjiLc9As19lEmqaRKQpfv9gHhAychEjGq0S lLJAOOuDTfOFpAmDeOiiYO6nf2oW+ynPdJnZnOe/iheS8JY9GWgTnt2s3I2ZMxwEorir lriexwco6OkJD9U1O3axCVYsfqIX2EJHy3Bffhj2N1N1PHi1CdQSXSLDuDO08rUQwHMo 1G6recmifUDixWqFhNEsInhKfU+dtrs7aw8cpHbsYG5i1WnFRQcrjB9iu2QcWm+AdsZM 4M8CzC07cx2iS6abu+nniymeXGpprKU04+yOQkASIYA5t96taSa3Gq5TcnA0IcrrwwwM +txg== X-Gm-Message-State: ALoCoQnXn0GyvmBqfVDF/fG9vmvaXhFKZESc2sXz8CwZ/t9dpO7H+5YPigIwPiUP4nG5TBPQd9AZ X-Received: by 10.28.52.17 with SMTP id b17mr5021731wma.41.1447161932861; Tue, 10 Nov 2015 05:25:32 -0800 (PST) Received: from [192.168.1.21] ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id h189sm11450986wme.1.2015.11.10.05.25.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Nov 2015 05:25:32 -0800 (PST) From: Neil Armstrong Subject: [PATCH 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: <5641F045.1060601@baylibre.com> Date: Tue, 10 Nov 2015 14:25:25 +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. 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 6a35e3f..449499d 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]);