From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B975C43612 for ; Mon, 7 Jan 2019 13:10:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D78952089F for ; Mon, 7 Jan 2019 13:10:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546866638; bh=H7f6dkii92ORHVfgJ2WII/zf0Vgn0JeX+GhWeEf2aCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bUjKIQXa7oAPuFKj0PeIWNZddQREwFdypOZOVmJBAhKHvOM0ZMW5XHnATMaJ3X4Md fVqOmPo5Q4MUoVNyLqRnbW0SqAnxWCkcW5jw3CmUTn42P2cpyatESmghMfaFfzKI+H ZEdRuWI9a+0DFE8j88VsBd5UClfVB588n/QMDXIA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731303AbfAGNJm (ORCPT ); Mon, 7 Jan 2019 08:09:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:56492 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727700AbfAGNJm (ORCPT ); Mon, 7 Jan 2019 08:09:42 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 379652089F; Mon, 7 Jan 2019 13:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546866581; bh=H7f6dkii92ORHVfgJ2WII/zf0Vgn0JeX+GhWeEf2aCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hTz5H0s40MMjCtY7wIE+ODUHTqXqxLtFMkfETt1HvHZpOkrPM1EKVDthr8YqCtjRR MRz/1lOIBlWw41hjK5tU2HrpYPpbUen3YMVzrx5+Ot7R1uGEJ+4u9FikFpFGG2tvdz eaaFeJQ+5+h81KD6bWtzT3CjmmW+1yQ+/VsttK8U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aaro Koskinen , Paul Burton , Ralf Baechle , James Hogan , linux-mips@vger.kernel.org Subject: [PATCH 4.9 66/71] MIPS: OCTEON: mark RGMII interface disabled on OCTEON III Date: Mon, 7 Jan 2019 13:33:35 +0100 Message-Id: <20190107105336.513887529@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190107105330.280153213@linuxfoundation.org> References: <20190107105330.280153213@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Aaro Koskinen commit edefae94b7b9f10d5efe32dece5a36e9d9ecc29e upstream. Commit 885872b722b7 ("MIPS: Octeon: Add Octeon III CN7xxx interface detection") added RGMII interface detection for OCTEON III, but it results in the following logs: [ 7.165984] ERROR: Unsupported Octeon model in __cvmx_helper_rgmii_probe [ 7.173017] ERROR: Unsupported Octeon model in __cvmx_helper_rgmii_probe The current RGMII routines are valid only for older OCTEONS that use GMX/ASX hardware blocks. On later chips AGL should be used, but support for that is missing in the mainline. Until that is added, mark the interface as disabled. Fixes: 885872b722b7 ("MIPS: Octeon: Add Octeon III CN7xxx interface detection") Signed-off-by: Aaro Koskinen Signed-off-by: Paul Burton Cc: Ralf Baechle Cc: James Hogan Cc: linux-mips@vger.kernel.org Cc: stable@vger.kernel.org # 4.7+ Signed-off-by: Greg Kroah-Hartman --- arch/mips/cavium-octeon/executive/cvmx-helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/mips/cavium-octeon/executive/cvmx-helper.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c @@ -290,7 +290,8 @@ static cvmx_helper_interface_mode_t __cv case 3: return CVMX_HELPER_INTERFACE_MODE_LOOP; case 4: - return CVMX_HELPER_INTERFACE_MODE_RGMII; + /* TODO: Implement support for AGL (RGMII). */ + return CVMX_HELPER_INTERFACE_MODE_DISABLED; default: return CVMX_HELPER_INTERFACE_MODE_DISABLED; }