Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp425729imu; Wed, 12 Dec 2018 20:33:58 -0800 (PST) X-Google-Smtp-Source: AFSGD/V7dWpI7k14LhtHCNYQpK7uJ0gcVp6Dnj8yJKvcHsVjyTkjPX15CXndgz40kqGju3yTMBeT X-Received: by 2002:a62:7892:: with SMTP id t140mr22633518pfc.237.1544675638715; Wed, 12 Dec 2018 20:33:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544675638; cv=none; d=google.com; s=arc-20160816; b=GTNNr+Rrj759NO6W7q8BoBRISBFH1smqq29rc1jKdo2glkQqeRBYjLno8tl8dSPPq/ sHkYH1FzXJWA8c47EcR2SXTa/SytSGyyEO6dlFehpj+RyQag6VjrfE6/GB7NI/3ei1Yf utJBy+B9zeJoOqIdgb4ElHlnteHq0Uadl6yRc+XJBpkDnT+InGznaAY29fiIIzyhQbHi mx3NWUmyXLzjZHVmjTMdvujzANcv2vDejHVu8txzKY1fbrdU7P85J80NSb+AGWn3VD8C S+Gy3HpHRI2Q6mfHnRSl747yTwt+HuKk2kr6hSPE4vznbbJ+OPKaG7yjajUEaYoYAr27 C+yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=6SEbNT7J+v29/YOghkh+7urZWyho6DvOvfjRxWeqtmE=; b=p/OMsin9kGRQ/NdnsFegVW9v5GnC7zN3pU1YVZXqwyrbSHLtDSfsLiVQcJ6gA6tDwj WYIHKQRlfEyQyqeWySs2bTxYHQJ3z8TI1wkJuu1ZT4YQmSIBNt527+oXLetega4w47Ye tpvV/3FF2Lo6RV6lRFx6zT5Y8bpXiHffhrLFWwOR3+FhFz38JGSEsPbdUw5cCD59ibkh fxqbX/pKWPXO/Usd2hXTZjSyhjgenrvAG/+yGCXzrt1bYQUQPerdDARVSEYzurM6jQdP UPAWpandurAkiC8A9EPPZOPXraFf/ZSUlSlE/xY4y6PfYX85lnR1rFmK83z0zeVfXjn+ aBZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sjyUtN7Z; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w31si688796pla.308.2018.12.12.20.33.44; Wed, 12 Dec 2018 20:33:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sjyUtN7Z; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728508AbeLMEay (ORCPT + 99 others); Wed, 12 Dec 2018 23:30:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:43712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726907AbeLMEax (ORCPT ); Wed, 12 Dec 2018 23:30:53 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B65AB20873; Thu, 13 Dec 2018 04:30:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675452; bh=iLWdxCW4UzB/f8IQdPxe9uDf+wEDaLxuX5/9SHWYNec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sjyUtN7Z9L2HzOrbgnDknvpzbOUuXz2vwYIdwXWTaGjxgp+YX14ZWaJkTs+rCvxE8 DhJTjh9WHRbsHDBiXoYCauO3TTsA5rx/CMUViNhWXOPQO/yL+0/k8X2klxeruhEiru Pwjq1BkVgjqfi+WU/LSs+IQdpfMfB0c02gFK/Gto= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Benjamin Herrenschmidt , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 72/73] Revert "net/ibm/emac: wrong bit is used for STA control" Date: Wed, 12 Dec 2018 23:28:37 -0500 Message-Id: <20181213042838.75160-72-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> References: <20181213042838.75160-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Benjamin Herrenschmidt [ Upstream commit 5b3279e2cba2238b37f6c18adfdea8bddb32715a ] This reverts commit 624ca9c33c8a853a4a589836e310d776620f4ab9. This commit is completely bogus. The STACR register has two formats, old and new, depending on the version of the IP block used. There's a pair of device-tree properties that can be used to specify the format used: has-inverted-stacr-oc has-new-stacr-staopc What this commit did was to change the bit definition used with the old parts to match the new parts. This of course breaks the driver on all the old ones. Instead, the author should have set the appropriate properties in the device-tree for the variant used on his board. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ibm/emac/emac.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ibm/emac/emac.h b/drivers/net/ethernet/ibm/emac/emac.h index e2f80cca9bed..0d2de6f67676 100644 --- a/drivers/net/ethernet/ibm/emac/emac.h +++ b/drivers/net/ethernet/ibm/emac/emac.h @@ -231,7 +231,7 @@ struct emac_regs { #define EMAC_STACR_PHYE 0x00004000 #define EMAC_STACR_STAC_MASK 0x00003000 #define EMAC_STACR_STAC_READ 0x00001000 -#define EMAC_STACR_STAC_WRITE 0x00000800 +#define EMAC_STACR_STAC_WRITE 0x00002000 #define EMAC_STACR_OPBC_MASK 0x00000C00 #define EMAC_STACR_OPBC_50 0x00000000 #define EMAC_STACR_OPBC_66 0x00000400 -- 2.19.1