Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp2565075pxb; Sun, 8 Nov 2020 05:24:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxydMekeuozhlQqZptQ6tio4/6xA3q888mNAarG3S9dBTVSgODTspNjBMnF/jW8RZYX1P3F X-Received: by 2002:aa7:dd45:: with SMTP id o5mr10340765edw.243.1604841869871; Sun, 08 Nov 2020 05:24:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604841869; cv=none; d=google.com; s=arc-20160816; b=X0k3kWUmjzhv0++BZFsH/oFGaheKAYa9M59MG/XJdIecMW3A2vpMZHqT/8kN5eMxh/ kK6WZ0ZR8tuaCKQEcpGiZQIXbtHeiC+u94D7qKKo/9hyhSv9OHqtwEkeobY2UJwsgx0T 4AFmMUf2kHnz1nL5H+Q28Z/mPKoJVMBWy5DDW3Zm2wlTA2/6vaNpdj+jvKSPdmn9vxC4 AjGFFaumFKJ5fcVO/Q/n2j6HAUj94r+zDmi/r2Ci7GZKc7MIIvpHrb2UrRclqeuXoNNk /9Hoqqx+Sk9cguM8SGbrld5w1uHGuJGdt6lW6sbcjyKZvxkRDMkx5BFnNRR4bVqRlcIW HjTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=Emjqnud9GLn7VEYUqhG6PIiP9MRKXoZrzIEAD6h2zk8=; b=xlOgWpNVIx0kH7sZI7ra1ATNzqg44xRXnLeDY4Q3kahWtWbQoF6FndSCQurJc2cRJH OJQItAsctt8XtTdsVsAt6boLn1ZrhwwHJe6RCGA2Sk7e08UFZCUzjwJnRRVmw5VWrKSD 3trNZNBpLEoP/q3MkP53Qbrhpwbdmiy46NIp2ldDki6un3DLA/dU5gPmP9QdsX6frKnJ gIxoarVLQT+jdG9J26W43+tPHdMceFYPFVIqbB55rYfnCuvX0wVZ49Akt3e01YzSJuoY L3vNY4AfvaH9CHVzquxIbH8+nWEEuQEMsVh4y1o0B4asPjO9C8965vxpEyhGM83kssp7 GQhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=B4LVcidP; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bi25si5205432ejb.21.2020.11.08.05.24.06; Sun, 08 Nov 2020 05:24:29 -0800 (PST) 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=@kernel.org header.s=default header.b=B4LVcidP; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728605AbgKHNWi (ORCPT + 99 others); Sun, 8 Nov 2020 08:22:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:52608 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728197AbgKHNWM (ORCPT ); Sun, 8 Nov 2020 08:22:12 -0500 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 71619206E3; Sun, 8 Nov 2020 13:21:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604841695; bh=SkSaZbbxbQKlOyOPpNzaJmiIA3JNvn8dwgGWjfjN+QE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=B4LVcidPH89nRcLhaaOqQuqZ//Xwx4z/bwAId7RogC4qHijueLwYDdlMOGsBajKnw ixHHmNnGau6nQGSI7eZSMZg+vvZeoN5wJIbx9j+OSjsobsDFy5NY2O/cM0kM0NRKJe UDvCl7vF/UFzDXD/gth7CDHwo3hiY2AO9NNQvFgE= Date: Sun, 8 Nov 2020 08:21:34 -0500 From: Sasha Levin To: Martin Blumenstingl Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Neil Armstrong , Kevin Hilman , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Subject: Re: [PATCH AUTOSEL 5.4 05/24] arm64: dts: amlogic: meson-g12: use the G12A specific dwmac compatible Message-ID: <20201108132134.GQ2092@sasha-vm> References: <20201103012007.183429-1-sashal@kernel.org> <20201103012007.183429-5-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 03, 2020 at 06:53:17AM +0100, Martin Blumenstingl wrote: >Hi Sasha, > >On Tue, Nov 3, 2020 at 2:20 AM Sasha Levin wrote: >> >> From: Martin Blumenstingl >> >> [ Upstream commit 1fdc97ae450ede2b4911d6737a57e6fca63b5f4a ] >> >> We have a dedicated "amlogic,meson-g12a-dwmac" compatible string for the >> Ethernet controller since commit 3efdb92426bf4 ("dt-bindings: net: >> dwmac-meson: Add a compatible string for G12A onwards"). >> Using the AXG compatible string worked fine so far because the >> dwmac-meson8b driver doesn't handle the newly introduced register bits >> for G12A. However, once that changes the driver must be probed with the >> correct compatible string to manage these new register bits. >> >> Signed-off-by: Martin Blumenstingl >> Reviewed-by: Neil Armstrong >> Signed-off-by: Kevin Hilman >> Link: https://lore.kernel.org/r/20200925211743.537496-1-martin.blumenstingl@googlemail.com >> Signed-off-by: Sasha Levin >if this patch will be included in 5.4-stable then please also backport >the following two commits: >- 3efdb92426bf4 ("dt-bindings: net: dwmac-meson: Add a compatible >string for G12A onwards") >- a4f63342d03d2d ("net: stmmac: dwmac-meson8b: add a compatible string >for G12A SoCs") > >Without these above two commits we'll lose Ethernet connectivity >because there's no G12A compatible string in 5.4 yet > >The quick solution would be to not backport this patch because the >driver in question doesn't do anything with the new compatible string >yet. I'll drop it from older branches that don't have those commits, thanks! -- Thanks, Sasha