From patchwork Fri Jul 14 06:31:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Luo X-Patchwork-Id: 120266 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp2318052vqm; Thu, 13 Jul 2023 23:57:02 -0700 (PDT) X-Google-Smtp-Source: APBJJlFKszcd6d+E5dWHnUVR/ZPYYWo5kCpKYxaCRqzlYafmhd/gLWWk2nUegCiWUPHl1bSjgtxQ X-Received: by 2002:a17:90b:3505:b0:256:2fd4:e238 with SMTP id ls5-20020a17090b350500b002562fd4e238mr2639397pjb.38.1689317821861; Thu, 13 Jul 2023 23:57:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689317821; cv=none; d=google.com; s=arc-20160816; b=Qlpdh8F5uoCZJ1IgcyVeomOsfSTzOvQZvClp5aMeeYR1ZLc1LotW9tPjBduButWYbe /ieCMlVkXpX7WRI84+grSg0dpmLptzoZZ0sTUi50JaatFlZiTx+vired0P7fmI1PWByq kY9t4X8bKLFU9L+Xj5LrQcKk1EqGdbnC/9uJwNeOuulOJQEoI4zejt3TxTkZg+r+9AxP GDXyftQHiT64YVmUePiQZ53H4IGd0R+g2T0xmhHzvHmfszZijF5XFgVWiNvtnooBF9qO Gi45bCRYc9dQVJiQGfNTujTn+xaHnphZ79Dvi9XrL0GRz4mfsrbYWJnhwLq4rx0hMLyR mbpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=qFXVQD0prdpA01sUHYh5ZXgAjpmSFkfts9H2Mz2NJOc=; fh=gVU0szpfyKL/tGzekjkLxkm9WXzJxBFICVcvBdLpZfE=; b=yig5tQdgz5cCXRRy41nEMhQnQnzYRzJp5DOa5Lt3YvR90mTvvb3xZZg3yJHRTjsmPg I+rHbSIPx9JlQlUW0slmalcVHoZ4AwCMyZBgOk0ohu9d8D4DheKBR1UD3K6qLP2JVW8V rffYpKIMJvuzT1nYCg3/K7A82Z1MEk5yi0437krfHOM4XPFCcZNX9qtWB65EDJu1PIwM 9TyyXqfzmnvWaY8+g9HYKzcPlLYYFh6ynfDFmoM+qlPeuPViA1EQS3xui4s0QXzFZFGO M4KQxoTyogIHAQ90DexiNmFOU6zcnbEUfN3bLWGNn4JCQJJA6AL7QsbyiY2sSaZAqyiZ FLOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=NW03l+7+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ip4-20020a17090b314400b002636d222400si818709pjb.14.2023.07.13.23.56.47; Thu, 13 Jul 2023 23:57:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=NW03l+7+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235237AbjGNGca (ORCPT + 99 others); Fri, 14 Jul 2023 02:32:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235212AbjGNGcU (ORCPT ); Fri, 14 Jul 2023 02:32:20 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7ABDC2D79; Thu, 13 Jul 2023 23:32:16 -0700 (PDT) Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36E4AjRb016863; Fri, 14 Jul 2023 06:32:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=qcppdkim1; bh=qFXVQD0prdpA01sUHYh5ZXgAjpmSFkfts9H2Mz2NJOc=; b=NW03l+7+F7/MUFGd/azi8PwKb0iufCtb+GpJAlRfmFvSnO+AvhpiuhLWWFEg7Y67mXU5 zodRWDODWPv1HDDmpQc2HrsymL8EsfXC+v4de5F+sBsLxEH5g5WNs0uiLjLMEKMPBc+1 PtvQiaOuTO4gI5nTClIcbkhg0rMc2NFZHNeGwTRpbf6/9+oIrTb32Ut/NcE4HovJMzf/ sJ85dBxc1in/MmkYQrycWeKXX9xiZwd7shEv9JhXC/tMXQ+WRP5YpovZM/cQ1GQuXrsg ychqZ7mV8VHnnmb2vJVRPXH0d+6tsvobsJdYTpPYJQ/2Ym2tejToH/TPUz6VqPgj5UN0 /w== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3rtptr11wy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Jul 2023 06:32:04 +0000 Received: from nalasex01c.na.qualcomm.com (nalasex01c.na.qualcomm.com [10.47.97.35]) by NALASPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 36E6W3Fi008679 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Jul 2023 06:32:03 GMT Received: from akronite-sh-dev02.qualcomm.com (10.80.80.8) by nalasex01c.na.qualcomm.com (10.47.97.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Thu, 13 Jul 2023 23:32:00 -0700 From: Luo Jie To: , , , , , , CC: , , Luo Jie Subject: [PATCH v2 2/6] net: phy: at803x: merge qca8081 salve seed function Date: Fri, 14 Jul 2023 14:31:32 +0800 Message-ID: <20230714063136.21368-3-quic_luoj@quicinc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230714063136.21368-1-quic_luoj@quicinc.com> References: <20230714063136.21368-1-quic_luoj@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01c.na.qualcomm.com (10.47.97.35) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: eDGjGR46A10QZDkizcu9Ip6j1ljymVTx X-Proofpoint-GUID: eDGjGR46A10QZDkizcu9Ip6j1ljymVTx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-14_03,2023-07-13_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 phishscore=0 mlxscore=0 lowpriorityscore=0 spamscore=0 impostorscore=0 priorityscore=1501 bulkscore=0 adultscore=0 suspectscore=0 mlxlogscore=997 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307140059 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771378123961635151 X-GMAIL-MSGID: 1771378123961635151 merge the seed enablement and seed value configuration into one function, since the random seed value is needed to be configured when the seed is enabled. Signed-off-by: Luo Jie Reviewed-by: Russell King (Oracle) --- drivers/net/phy/at803x.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index 11388ef3f7ef..1d4aef60d51a 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -1725,24 +1725,19 @@ static int qca808x_phy_fast_retrain_config(struct phy_device *phydev) return 0; } -static int qca808x_phy_ms_random_seed_set(struct phy_device *phydev) -{ - u16 seed_value = get_random_u32_below(QCA808X_MASTER_SLAVE_SEED_RANGE); - - return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED, - QCA808X_MASTER_SLAVE_SEED_CFG, - FIELD_PREP(QCA808X_MASTER_SLAVE_SEED_CFG, seed_value)); -} - static int qca808x_phy_ms_seed_enable(struct phy_device *phydev, bool enable) { - u16 seed_enable = 0; + u16 seed_value; - if (enable) - seed_enable = QCA808X_MASTER_SLAVE_SEED_ENABLE; + if (!enable) + return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED, + QCA808X_MASTER_SLAVE_SEED_ENABLE, 0); + seed_value = get_random_u32_below(QCA808X_MASTER_SLAVE_SEED_RANGE); return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED, - QCA808X_MASTER_SLAVE_SEED_ENABLE, seed_enable); + QCA808X_MASTER_SLAVE_SEED_CFG | QCA808X_MASTER_SLAVE_SEED_ENABLE, + FIELD_PREP(QCA808X_MASTER_SLAVE_SEED_CFG, seed_value) | + QCA808X_MASTER_SLAVE_SEED_ENABLE); } static int qca808x_config_init(struct phy_device *phydev) @@ -1766,12 +1761,7 @@ static int qca808x_config_init(struct phy_device *phydev) if (ret) return ret; - /* Configure lower ramdom seed to make phy linked as slave mode */ - ret = qca808x_phy_ms_random_seed_set(phydev); - if (ret) - return ret; - - /* Enable seed */ + /* Enable seed and configure lower ramdom seed to make phy linked as slave mode */ ret = qca808x_phy_ms_seed_enable(phydev, true); if (ret) return ret; @@ -1816,7 +1806,6 @@ static int qca808x_read_status(struct phy_device *phydev) if (phydev->master_slave_state == MASTER_SLAVE_STATE_ERR) { qca808x_phy_ms_seed_enable(phydev, false); } else { - qca808x_phy_ms_random_seed_set(phydev); qca808x_phy_ms_seed_enable(phydev, true); } }