From patchwork Tue Sep 22 09:23:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 1368872 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=oLds3Xg2; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BwbhP6sgwz9sTC for ; Tue, 22 Sep 2020 19:33:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A05918259A; Tue, 22 Sep 2020 11:32:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="oLds3Xg2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2499982451; Tue, 22 Sep 2020 11:32:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20613.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::613]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8F70C82451 for ; Tue, 22 Sep 2020 11:32:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=zhiqiang.hou@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sh8zT4Rz8HAogg8xipvrIKKrBq1HB4terHah0Ao1VY0rLm2k4NtPk15wRcjiz0mb5ExLVQdNZhe50U+5HHtobSX4WBoAyn7wKf0OqQRRLYj+3JVTvMsBxc0rx1fAnd5MrbRIzaCfBioT59BA3fmv0wDCzD0Mt5KGdJTXLxvSuaIpsifj/Jd18GfAfsLgl2PytJmNAIVMxv0KOGEEfjK0RPObOvyVgxcRbIt3qjZdEBtdobs4XaIhMgn/CWzm3lYCQNsMK/s7RGZYCpNXp2aNKBhHWLBCss1fG8HGLRLPAoU3L2VsHX/CqpaWGg7JpPY5Q9NxJtQ6EAziOUMNx3ChXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tnub9yJnO1kQc9qvOweJJro1OkYFXbvlbGVUrRJVX8g=; b=LNC1bksB/OPSTqOtAJppj2xSQtUZn8EPmoeD+rSf8N6xkRd/ph0Hc2V/WO8RjpH2yMG/9/hJ1Oztjf91IyZNRzFtVYkQhKkJVkTDogyv0KUpvrxEoL/PCE5RfoCN3BnWgTPg0fuAXCmqdbOn7iI09Ojpxa5yz5nOgDeYeO715IcVUq5xKanEAIlB1z2mKP3+rlveTVmXzJWU/RW4jxchamKLLHf7vwDutyFlhl8H9KnShIunRVTkzWN/8PBtJbtoxZeDd26IQG3H179u1eTq3kqsYM+Yh4OKL1MGW+ecHRSuo5QyruwaNGadL1Y3dwH9TDt6LYODInXS60IlzWovNQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tnub9yJnO1kQc9qvOweJJro1OkYFXbvlbGVUrRJVX8g=; b=oLds3Xg2FN7GfJFfoxYkuyrJLBuHVD63unJ1EVzqZFVQuJAQsIPSGOs0ymGo9mCe9Wt7Hhf/Uxk3Z2sE626Qx09eHJxpVDNk3jTAUX2n/qqSBINzR0lFYlLdd+iZZ8DzG+y5xwF+B3er4+PL5ozu51uarRb0BPad1cpqf64DelA= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from HE1PR0402MB3371.eurprd04.prod.outlook.com (2603:10a6:7:85::27) by HE1PR0402MB2889.eurprd04.prod.outlook.com (2603:10a6:3:d6::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.17; Tue, 22 Sep 2020 09:32:26 +0000 Received: from HE1PR0402MB3371.eurprd04.prod.outlook.com ([fe80::c872:d354:7cf7:deb9]) by HE1PR0402MB3371.eurprd04.prod.outlook.com ([fe80::c872:d354:7cf7:deb9%3]) with mapi id 15.20.3391.026; Tue, 22 Sep 2020 09:32:26 +0000 From: Zhiqiang Hou To: u-boot@lists.denx.de, bmeng.cn@gmail.com, olteanv@gmail.com, priyanka.jain@nxp.com Cc: Hou Zhiqiang Subject: [PATCHv6 03/18] net: fsl_mdio: Correct the MII management register block address Date: Tue, 22 Sep 2020 17:23:32 +0800 Message-Id: <20200922092347.19141-4-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200922092347.19141-1-Zhiqiang.Hou@nxp.com> References: <20200922092347.19141-1-Zhiqiang.Hou@nxp.com> X-ClientProxiedBy: SG2PR06CA0169.apcprd06.prod.outlook.com (2603:1096:1:1e::23) To HE1PR0402MB3371.eurprd04.prod.outlook.com (2603:10a6:7:85::27) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (119.31.174.73) by SG2PR06CA0169.apcprd06.prod.outlook.com (2603:1096:1:1e::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3391.13 via Frontend Transport; Tue, 22 Sep 2020 09:32:24 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [119.31.174.73] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0ebb885f-76d2-407d-28ee-08d85eda6b05 X-MS-TrafficTypeDiagnostic: HE1PR0402MB2889: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1468; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8p33dkM/aKMrBT9T1WET0VLcXN0CLePgfdIcdiU+AcFBa5o047DXOgaUjbhEMp/xw2JAV61+0G8Xl49+8RfUQdw9shV3tafiYPE5UuULyKg3ZfJRXCprzXHJi5n3i9M8TDrbHfhY/9btiGC4B2/M20pYs/bd5Lv18TJip3BVLHkiPf18isFwpwwb9fSH5FeqLAu9t9vTPnIL4nJsFIu4MUDrT/XIdCmAIRPS9fCVLlHMIW6axKBJiv4DwuDW9rM/CRF57nURPH6PJMpDDcvUIFN9F5/rFm/99jEf0gI5O8mSXdfPGvnCGUhGh4LY/Dcu34Axyc2aFq5Qu6i+p9twUswziwlFXegIFLRHzeV/VnPZ3jNLC/0hnKSvSfcSGXzH X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:HE1PR0402MB3371.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(376002)(136003)(396003)(39860400002)(346002)(8676002)(66946007)(6636002)(5660300002)(316002)(8936002)(6512007)(4326008)(66556008)(66476007)(2906002)(83380400001)(186003)(26005)(478600001)(86362001)(69590400008)(6506007)(1076003)(52116002)(16526019)(956004)(6486002)(36756003)(2616005)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: emfoigbQGfJBe/0L5jymyqDicYW186Fo1ET0v1vu+k5tV/TQuHI/1rCWpaR39LsjzuH00FKzA0qvYfaE4TqZwtlvb6mdBYWK+VF52Pbs7U2mAlmvifRS89df+3hMXP73JYFEv3jxgDJGiS37zZ2mZCvKWAyKChulpJ//NfxvdvsrjawagGCuAmOxN7f3RWYMstBnMFGlXOaWOTfbxQbSkCfK1sjaKs44sdWzM1KrjLs66Fbnr1fDNBd3kuX07owxM+KP9NK+0rtgF4jCm2dd5I4h9zzDNGxjlUu9+6SDekLvPQ3+rBeHazcDvdhxRxyAcrnGNoV9zYS3Wpyp9ApEM5yRWklJvE5INdZNTCADunR422Jk3v8pXcM/XtvNxqyVE6CaQ1skRsDtuCQGk+2slZSn16eMhHSb+8Z4O92FgBQ6yxQU46j6tUneps/wf2ZdfQ8IL20RnCBsrd75buN+sPEzzAKk+KYMfcGtrtCxaD/6sydYXhufAfBm5+1IX9oxrhdVoI6INztLwR6T8X/0rxJ90uqswuHU97fsUYtBVT+m9eb+2i6Vd2Mquk0Id30Ld0TF0mCwQ7LnvjbgezZ1nwS6UFG/k+4ZSTfEjlnklL7NNhcu74oLuThSTsTwVlLNkOmVNKwo/3yWFGCDrc6tsg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ebb885f-76d2-407d-28ee-08d85eda6b05 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3371.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2020 09:32:26.6785 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /980zx8bXVTBdPZ/l6yiRB6jSk25w14+HNxDZd63FZNYSkMmhwoqWPHEuhoDAuNvcc4Yroz7j1JttfVWwmBQtw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB2889 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean From: Hou Zhiqiang The MII management register block offset is different between gianfar and etsec2 compatible devices, this patch is to fix this issue by adding driver data for different compatible string. Fixes: 2932c5a802a9 ("net: tsec: fsl_mdio: add DM MDIO support") Signed-off-by: Hou Zhiqiang Reviewed-by: Vladimir Oltean --- V6: - No change. drivers/net/fsl_mdio.c | 28 ++++++++++++++++++++++------ include/fsl_mdio.h | 4 ++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/drivers/net/fsl_mdio.c b/drivers/net/fsl_mdio.c index ae96ce4c7b..77f1a96a2e 100644 --- a/drivers/net/fsl_mdio.c +++ b/drivers/net/fsl_mdio.c @@ -11,6 +11,7 @@ #include #include #include +#include #ifdef CONFIG_DM_MDIO struct tsec_mdio_priv { @@ -190,17 +191,30 @@ static const struct mdio_ops tsec_mdio_ops = { .reset = tsec_mdio_reset, }; +static struct fsl_pq_mdio_data etsec2_data = { + .mdio_regs_off = TSEC_MDIO_REGS_OFFSET, +}; + +static struct fsl_pq_mdio_data gianfar_data = { + .mdio_regs_off = 0x0, +}; + +static struct fsl_pq_mdio_data fman_data = { + .mdio_regs_off = 0x0, +}; + static const struct udevice_id tsec_mdio_ids[] = { - { .compatible = "fsl,gianfar-tbi" }, - { .compatible = "fsl,gianfar-mdio" }, - { .compatible = "fsl,etsec2-tbi" }, - { .compatible = "fsl,etsec2-mdio" }, - { .compatible = "fsl,fman-mdio" }, + { .compatible = "fsl,gianfar-tbi", .data = (ulong)&gianfar_data }, + { .compatible = "fsl,gianfar-mdio", .data = (ulong)&gianfar_data }, + { .compatible = "fsl,etsec2-tbi", .data = (ulong)&etsec2_data }, + { .compatible = "fsl,etsec2-mdio", .data = (ulong)&etsec2_data }, + { .compatible = "fsl,fman-mdio", .data = (ulong)&fman_data }, {} }; static int tsec_mdio_probe(struct udevice *dev) { + struct fsl_pq_mdio_data *data; struct tsec_mdio_priv *priv = (dev) ? dev_get_priv(dev) : NULL; struct mdio_perdev_priv *pdata = (dev) ? dev_get_uclass_priv(dev) : NULL; @@ -213,7 +227,9 @@ static int tsec_mdio_probe(struct udevice *dev) printf("dev_get_priv(dev %p) = NULL\n", dev); return -1; } - priv->regs = dev_remap_addr(dev); + + data = (struct fsl_pq_mdio_data *)dev_get_driver_data(dev); + priv->regs = dev_remap_addr(dev) + data->mdio_regs_off; debug("%s priv %p @ regs %p, pdata %p\n", __func__, priv, priv->regs, pdata); diff --git a/include/fsl_mdio.h b/include/fsl_mdio.h index 41cb73717b..b6c02cf342 100644 --- a/include/fsl_mdio.h +++ b/include/fsl_mdio.h @@ -55,6 +55,10 @@ int memac_mdio_read(struct mii_dev *bus, int port_addr, int dev_addr, int regnum); int memac_mdio_reset(struct mii_dev *bus); +struct fsl_pq_mdio_data { + u32 mdio_regs_off; +}; + struct fsl_pq_mdio_info { struct tsec_mii_mng __iomem *regs; char *name;