From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.eswincomputing.com (mail.eswincomputing.com [123.124.195.78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2283D25333F; Wed, 10 Jun 2026 01:32:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=123.124.195.78 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781055132; cv=none; b=sATFEvMuv5R4RVQ3dUucfJDMxk8N1Ny+FPSTgx4gJzD24cI/HVAdzdXFyvPpvpv/jTnyvFumRipuI38arWdg47bYD5IoE1YANG8+tnZ66FlgzqtH+rxQHtTL0E43FiNRlUeTgx01FbLpltksi7oGGYDJKQ6GLqy0wVzbFIDz60k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781055132; c=relaxed/simple; bh=G/iV1gy8avPsG6/qxdZ43w3Z/0VhPzFa/z1S52J5CG8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iIpSDb+fEhwc7122cmBA8FCRKqZnty47IK6pQtzsGKoHcioZEa7/zbxuMVlRdniMFCwjDB5jfSZo9yLXReuP7K46EVCcLogoGWsDIS2BNzy++n1MZvCmgwfse41191Nndq684X+UErfozaFjBZbAPBU5URWjvrfNXm8MFoo+p20= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=eswincomputing.com; spf=pass smtp.mailfrom=eswincomputing.com; arc=none smtp.client-ip=123.124.195.78 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=eswincomputing.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=eswincomputing.com Received: from E0004057DT.eswin.cn (unknown [10.11.96.26]) by app1 (Coremail) with SMTP id TAJkCgDHXHGFvihqMZQlAA--.370S2; Wed, 10 Jun 2026 09:31:51 +0800 (CST) From: lizhi2@eswincomputing.com To: devicetree@vger.kernel.org, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, netdev@vger.kernel.org, pabeni@redhat.com, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, rmk+kernel@armlinux.org.uk, pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, linux-riscv@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, maxime.chevallier@bootlin.com Cc: ningyu@eswincomputing.com, linmin@eswincomputing.com, pinkesh.vaghela@einfochips.com, pritesh.patel@einfochips.com, weishangjuan@eswincomputing.com, horms@kernel.org, lee@kernel.org, Zhi Li Subject: [PATCH net-next v8 4/6] net: stmmac: eic7700: add support for eth1 clock inversion variant Date: Wed, 10 Jun 2026 09:31:48 +0800 Message-ID: <20260610013149.938-1-lizhi2@eswincomputing.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260610012727.848-1-lizhi2@eswincomputing.com> References: <20260610012727.848-1-lizhi2@eswincomputing.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CM-TRANSID:TAJkCgDHXHGFvihqMZQlAA--.370S2 X-Coremail-Antispam: 1UD129KBjvJXoWxtw48CFy8tr1kXr43CrW5Awb_yoW3Ww48pF W8CrW5KF4qqr1fK397JF4vva4YyF4xKr4SyrWrKFsayas8tr98Xa40ya48JFy8GrW3Zr13 Xw4jyFWxZa9F9rJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBC14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv6xkF7I0E14v26r xl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj 6xIIjxv20xvE14v26r126r1DMcIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr 0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E 8cxan2IY04v7M4kE6xkIj40Ew7xC0wCY1x0262kKe7AKxVW8ZVWrXwCY02Avz4vE-syl42 xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWU GwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r4a6rW5MIIYrxkI7VAKI4 8JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4UJVWx Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0x vEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjTRNBMKDUUUU X-CM-SenderInfo: xol2xx2s6h245lqf0zpsxwx03jof0z/ From: Zhi Li The eth1 MAC exhibits silicon-inherent RX and TX timing behavior that differs from the eth0 implementation. At 1000Mbps, RX sampling requires clock inversion due to a fixed MAC input skew that cannot be compensated by standard RGMII delay settings. The TX path includes a fixed ~2ns internal delay introduced by the MAC silicon. This delay is always present and is already accounted for in the device tree tx-internal-delay-ps property as part of the effective output timing. The tx-internal-delay-ps property describes the effective delay seen at the MAC output. Since the hardware register controls only the programmable portion of the delay, the driver subtracts the fixed silicon-inherent component before programming the delay register. Use compatible-specific match data to identify the eth1 variant and apply RX clock inversion only at 1000Mbps. The PHY interface mode is adjusted via phy_fix_phy_mode_for_mac_delays() to avoid double-application of RGMII delays when MAC-side delays are already present. Link speed dependency means RX sampling configuration is applied in the fix_mac_speed callback after negotiation. No behavior changes for the existing eth0 controller. Signed-off-by: Zhi Li --- .../ethernet/stmicro/stmmac/dwmac-eic7700.c | 107 +++++++++++++++++- 1 file changed, 101 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c index ec99b597aeaf..34a394a20570 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-eic7700.c @@ -29,10 +29,14 @@ /* * TX/RX Clock Delay Bit Masks: * - TX Delay: bits [14:8] — TX_CLK delay (unit: 0.02ns per bit) + * - TX Invert : bit [15] * - RX Delay: bits [30:24] — RX_CLK delay (unit: 0.02ns per bit) + * - RX Invert : bit [31] */ #define EIC7700_ETH_TX_ADJ_DELAY GENMASK(14, 8) #define EIC7700_ETH_RX_ADJ_DELAY GENMASK(30, 24) +#define EIC7700_ETH_TX_INV_DELAY BIT(15) +#define EIC7700_ETH_RX_INV_DELAY BIT(31) #define EIC7700_MAX_DELAY_STEPS 0x7F #define EIC7700_DELAY_STEP_PS 20 @@ -43,7 +47,14 @@ static const char * const eic7700_clk_names[] = { "tx", "axi", "cfg", }; +struct eic7700_dwmac_data { + bool rgmii_rx_clk_invert; + bool has_internal_tx_delay; + u32 tx_clk_inherent_skew_ps; +}; + struct eic7700_qos_priv { + struct device *dev; struct plat_stmmacenet_data *plat_dat; struct regmap *eic7700_hsp_regmap; u32 eth_axi_lp_ctrl_offset; @@ -54,6 +65,7 @@ struct eic7700_qos_priv { u32 eth_clk_dly_param; bool has_txd_offset; bool has_rxd_offset; + bool eth_rx_clk_inv; }; static int eic7700_clks_config(void *priv, bool enabled) @@ -97,9 +109,6 @@ static int eic7700_dwmac_init(struct device *dev, void *priv) if (dwc->has_rxd_offset) regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_rxd_offset, 0); - regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_clk_offset, - dwc->eth_clk_dly_param); - return 0; } @@ -126,8 +135,38 @@ static int eic7700_dwmac_resume(struct device *dev, void *priv) return ret; } +/* + * eth1 requires RX clock inversion at 1000Mbps due to silicon-inherent + * RX sampling skew at MAC input. + * + * The configuration is updated in fix_mac_speed() because the required + * sampling behavior depends on the negotiated link speed. + */ +static void eic7700_dwmac_fix_speed(void *priv, phy_interface_t interface, + int speed, unsigned int mode) +{ + struct eic7700_qos_priv *dwc = (struct eic7700_qos_priv *)priv; + u32 dly_param = dwc->eth_clk_dly_param; + + switch (speed) { + case SPEED_1000: + if (dwc->eth_rx_clk_inv) + dly_param |= EIC7700_ETH_RX_INV_DELAY; + break; + case SPEED_100: + case SPEED_10: + break; + default: + dev_warn(dwc->dev, "unsupported speed %u\n", speed); + return; + } + + regmap_write(dwc->eic7700_hsp_regmap, dwc->eth_clk_offset, dly_param); +} + static int eic7700_dwmac_probe(struct platform_device *pdev) { + const struct eic7700_dwmac_data *data; struct plat_stmmacenet_data *plat_dat; struct stmmac_resources stmmac_res; struct eic7700_qos_priv *dwc_priv; @@ -148,6 +187,30 @@ static int eic7700_dwmac_probe(struct platform_device *pdev) if (!dwc_priv) return -ENOMEM; + dwc_priv->dev = &pdev->dev; + + data = device_get_match_data(&pdev->dev); + if (!data) + return dev_err_probe(&pdev->dev, + -EINVAL, "no match data found\n"); + + dwc_priv->eth_rx_clk_inv = data->rgmii_rx_clk_invert; + /* + * The MAC silicon unconditionally adds ~2 ns TX delay; prevent + * the PHY from also adding TX delay to avoid doubling it. + * + * DT specifies rgmii-id (TX from MAC silicon, RX from PHY); + * override to rgmii-rxid so the PHY only adds its RX delay. + */ + if (data->has_internal_tx_delay) { + plat_dat->phy_interface = + phy_fix_phy_mode_for_mac_delays(plat_dat->phy_interface, + true, false); + if (plat_dat->phy_interface == PHY_INTERFACE_MODE_NA) + return dev_err_probe(&pdev->dev, -EINVAL, + "phy interface mode is NA\n"); + } + /* Read rx-internal-delay-ps and update rx_clk delay */ if (!of_property_read_u32(pdev->dev.of_node, "rx-internal-delay-ps", &delay_ps)) { @@ -167,7 +230,13 @@ static int eic7700_dwmac_probe(struct platform_device *pdev) FIELD_PREP(EIC7700_ETH_RX_ADJ_DELAY, val); } - /* Read tx-internal-delay-ps and update tx_clk delay */ + /* Read tx-internal-delay-ps and update tx_clk delay. + * + * For eswin,eic7700-qos-eth-clk-inversion, the DT property describes + * the effective TX delay at the MAC output, including the inherent + * silicon delay. Subtract the fixed component to obtain the + * programmable delay value. + */ if (!of_property_read_u32(pdev->dev.of_node, "tx-internal-delay-ps", &delay_ps)) { if (delay_ps % EIC7700_DELAY_STEP_PS) @@ -175,9 +244,16 @@ static int eic7700_dwmac_probe(struct platform_device *pdev) "tx delay must be multiple of %dps\n", EIC7700_DELAY_STEP_PS); + if (delay_ps < data->tx_clk_inherent_skew_ps) + return dev_err_probe(&pdev->dev, -EINVAL, + "tx delay %ups below inherent skew %ups\n", + delay_ps, data->tx_clk_inherent_skew_ps); + + delay_ps -= data->tx_clk_inherent_skew_ps; + if (delay_ps > EIC7700_MAX_DELAY_PS) return dev_err_probe(&pdev->dev, -EINVAL, - "tx delay out of range\n"); + "tx delay out of programmable range\n"); val = delay_ps / EIC7700_DELAY_STEP_PS; @@ -254,12 +330,31 @@ static int eic7700_dwmac_probe(struct platform_device *pdev) plat_dat->exit = eic7700_dwmac_exit; plat_dat->suspend = eic7700_dwmac_suspend; plat_dat->resume = eic7700_dwmac_resume; + plat_dat->fix_mac_speed = eic7700_dwmac_fix_speed; return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res); } +static const struct eic7700_dwmac_data eic7700_dwmac_data = { + .rgmii_rx_clk_invert = false, + .has_internal_tx_delay = false, + .tx_clk_inherent_skew_ps = 0, +}; + +static const struct eic7700_dwmac_data eic7700_dwmac_data_clk_inversion = { + .rgmii_rx_clk_invert = true, + .has_internal_tx_delay = true, + .tx_clk_inherent_skew_ps = 2000, +}; + static const struct of_device_id eic7700_dwmac_match[] = { - { .compatible = "eswin,eic7700-qos-eth" }, + { .compatible = "eswin,eic7700-qos-eth", + .data = &eic7700_dwmac_data, + }, + { + .compatible = "eswin,eic7700-qos-eth-clk-inversion", + .data = &eic7700_dwmac_data_clk_inversion, + }, { } }; MODULE_DEVICE_TABLE(of, eic7700_dwmac_match); -- 2.25.1 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 05198CD8CB2 for ; Wed, 10 Jun 2026 01:32:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sDZ2PPJXEMe7LcdUUVbTyt1drP93Y7vSC43035rn7mE=; b=r1bx/21JUBgbo/ h7btCNDUKyk+uNZYiulaPCSoH6RmCbpIq/XUWH59aO3YPgG4v9I1qW4w+ZwQEPVndZX9nIwwe2B/p LFwVdeZwUlS/hS5yeQ4nHRQvXJ5/69j6JP4Q+lgOqxRpReH7rXln/nq+516BTmkrp8ud6EVC0ukev lGFonFY30CmRWBhJwakwQuHGHwr2WAwZmCt4iLjP0Iz2irL33HOEXvmZKf1aOlUB1JHJcXWCB6ioj rBgrWX6UYtTHLKOQLm0DNBD0A7uzNSaW4Id9CiohKAv/+oraWlFcg3t6n+qmA5VprWLeJofhncquN Hu5/TMzWQNSOaHmbFQnw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wX7na-00000006dtG-4ALQ; Wed, 10 Jun 2026 01:32:07 +0000 Received: from mail.eswincomputing.com ([123.124.195.78]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wX7nZ-00000006dso-11zp; Wed, 10 Jun 2026 01:32:06 +0000 Received: from E0004057DT.eswin.cn (unknown [10.11.96.26]) by app1 (Coremail) with SMTP id TAJkCgDHXHGFvihqMZQlAA--.370S2; Wed, 10 Jun 2026 09:31:51 +0800 (CST) From: lizhi2@eswincomputing.com To: devicetree@vger.kernel.org, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, netdev@vger.kernel.org, pabeni@redhat.com, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, rmk+kernel@armlinux.org.uk, pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, linux-riscv@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, maxime.chevallier@bootlin.com Cc: ningyu@eswincomputing.com, linmin@eswincomputing.com, pinkesh.vaghela@einfochips.com, pritesh.patel@einfochips.com, weishangjuan@eswincomputing.com, horms@kernel.org, lee@kernel.org, Zhi Li Subject: [PATCH net-next v8 4/6] net: stmmac: eic7700: add support for eth1 clock inversion variant Date: Wed, 10 Jun 2026 09:31:48 +0800 Message-ID: <20260610013149.938-1-lizhi2@eswincomputing.com> X-Mailer: git-send-email 2.52.0.windows.1 In-Reply-To: <20260610012727.848-1-lizhi2@eswincomputing.com> References: <20260610012727.848-1-lizhi2@eswincomputing.com> MIME-Version: 1.0 X-CM-TRANSID: TAJkCgDHXHGFvihqMZQlAA--.370S2 X-Coremail-Antispam: 1UD129KBjvJXoWxtw48CFy8tr1kXr43CrW5Awb_yoW3Ww48pF W8CrW5KF4qqr1fK397JF4vva4YyF4xKr4SyrWrKFsayas8tr98Xa40ya48JFy8GrW3Zr13 Xw4jyFWxZa9F9rJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBC14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26w1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4U JVWxJr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv6xkF7I0E14v26r xl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj 6xIIjxv20xvE14v26r126r1DMcIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr 0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYxC7M4IIrI8v6xkF7I0E 8cxan2IY04v7M4kE6xkIj40Ew7xC0wCY1x0262kKe7AKxVW8ZVWrXwCY02Avz4vE-syl42 xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWU GwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r4a6rW5MIIYrxkI7VAKI4 8JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4UJVWx Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0x vEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjTRNBMKDUUUU X-CM-SenderInfo: xol2xx2s6h245lqf0zpsxwx03jof0z/ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260609_183205_576981_B7D0A9A7 X-CRM114-Status: GOOD ( 22.72 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org RnJvbTogWmhpIExpIDxsaXpoaTJAZXN3aW5jb21wdXRpbmcuY29tPgoKVGhlIGV0aDEgTUFDIGV4 aGliaXRzIHNpbGljb24taW5oZXJlbnQgUlggYW5kIFRYIHRpbWluZyBiZWhhdmlvciB0aGF0CmRp ZmZlcnMgZnJvbSB0aGUgZXRoMCBpbXBsZW1lbnRhdGlvbi4KCkF0IDEwMDBNYnBzLCBSWCBzYW1w bGluZyByZXF1aXJlcyBjbG9jayBpbnZlcnNpb24gZHVlIHRvIGEgZml4ZWQgTUFDCmlucHV0IHNr ZXcgdGhhdCBjYW5ub3QgYmUgY29tcGVuc2F0ZWQgYnkgc3RhbmRhcmQgUkdNSUkgZGVsYXkgc2V0 dGluZ3MuCgpUaGUgVFggcGF0aCBpbmNsdWRlcyBhIGZpeGVkIH4ybnMgaW50ZXJuYWwgZGVsYXkg aW50cm9kdWNlZCBieSB0aGUgTUFDCnNpbGljb24uIFRoaXMgZGVsYXkgaXMgYWx3YXlzIHByZXNl bnQgYW5kIGlzIGFscmVhZHkgYWNjb3VudGVkIGZvciBpbgp0aGUgZGV2aWNlIHRyZWUgdHgtaW50 ZXJuYWwtZGVsYXktcHMgcHJvcGVydHkgYXMgcGFydCBvZiB0aGUgZWZmZWN0aXZlCm91dHB1dCB0 aW1pbmcuCgpUaGUgdHgtaW50ZXJuYWwtZGVsYXktcHMgcHJvcGVydHkgZGVzY3JpYmVzIHRoZSBl ZmZlY3RpdmUgZGVsYXkgc2VlbiBhdAp0aGUgTUFDIG91dHB1dC4gU2luY2UgdGhlIGhhcmR3YXJl IHJlZ2lzdGVyIGNvbnRyb2xzIG9ubHkgdGhlCnByb2dyYW1tYWJsZSBwb3J0aW9uIG9mIHRoZSBk ZWxheSwgdGhlIGRyaXZlciBzdWJ0cmFjdHMgdGhlIGZpeGVkCnNpbGljb24taW5oZXJlbnQgY29t cG9uZW50IGJlZm9yZSBwcm9ncmFtbWluZyB0aGUgZGVsYXkgcmVnaXN0ZXIuCgpVc2UgY29tcGF0 aWJsZS1zcGVjaWZpYyBtYXRjaCBkYXRhIHRvIGlkZW50aWZ5IHRoZSBldGgxIHZhcmlhbnQgYW5k CmFwcGx5IFJYIGNsb2NrIGludmVyc2lvbiBvbmx5IGF0IDEwMDBNYnBzLgoKVGhlIFBIWSBpbnRl cmZhY2UgbW9kZSBpcyBhZGp1c3RlZCB2aWEgcGh5X2ZpeF9waHlfbW9kZV9mb3JfbWFjX2RlbGF5 cygpCnRvIGF2b2lkIGRvdWJsZS1hcHBsaWNhdGlvbiBvZiBSR01JSSBkZWxheXMgd2hlbiBNQUMt c2lkZSBkZWxheXMgYXJlCmFscmVhZHkgcHJlc2VudC4KCkxpbmsgc3BlZWQgZGVwZW5kZW5jeSBt ZWFucyBSWCBzYW1wbGluZyBjb25maWd1cmF0aW9uIGlzIGFwcGxpZWQgaW4gdGhlCmZpeF9tYWNf c3BlZWQgY2FsbGJhY2sgYWZ0ZXIgbmVnb3RpYXRpb24uCgpObyBiZWhhdmlvciBjaGFuZ2VzIGZv ciB0aGUgZXhpc3RpbmcgZXRoMCBjb250cm9sbGVyLgoKU2lnbmVkLW9mZi1ieTogWmhpIExpIDxs aXpoaTJAZXN3aW5jb21wdXRpbmcuY29tPgotLS0KIC4uLi9ldGhlcm5ldC9zdG1pY3JvL3N0bW1h Yy9kd21hYy1laWM3NzAwLmMgICB8IDEwNyArKysrKysrKysrKysrKysrKy0KIDEgZmlsZSBjaGFu Z2VkLCAxMDEgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL25ldC9ldGhlcm5ldC9zdG1pY3JvL3N0bW1hYy9kd21hYy1laWM3NzAwLmMgYi9kcml2ZXJz L25ldC9ldGhlcm5ldC9zdG1pY3JvL3N0bW1hYy9kd21hYy1laWM3NzAwLmMKaW5kZXggZWM5OWI1 OTdhZWFmLi4zNGEzOTRhMjA1NzAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbmV0L2V0aGVybmV0L3N0 bWljcm8vc3RtbWFjL2R3bWFjLWVpYzc3MDAuYworKysgYi9kcml2ZXJzL25ldC9ldGhlcm5ldC9z dG1pY3JvL3N0bW1hYy9kd21hYy1laWM3NzAwLmMKQEAgLTI5LDEwICsyOSwxNCBAQAogLyoKICAq IFRYL1JYIENsb2NrIERlbGF5IEJpdCBNYXNrczoKICAqIC0gVFggRGVsYXk6IGJpdHMgWzE0Ojhd IOKAlCBUWF9DTEsgZGVsYXkgKHVuaXQ6IDAuMDJucyBwZXIgYml0KQorICogLSBUWCBJbnZlcnQg OiBiaXQgIFsxNV0KICAqIC0gUlggRGVsYXk6IGJpdHMgWzMwOjI0XSDigJQgUlhfQ0xLIGRlbGF5 ICh1bml0OiAwLjAybnMgcGVyIGJpdCkKKyAqIC0gUlggSW52ZXJ0IDogYml0ICBbMzFdCiAgKi8K ICNkZWZpbmUgRUlDNzcwMF9FVEhfVFhfQURKX0RFTEFZCUdFTk1BU0soMTQsIDgpCiAjZGVmaW5l IEVJQzc3MDBfRVRIX1JYX0FESl9ERUxBWQlHRU5NQVNLKDMwLCAyNCkKKyNkZWZpbmUgRUlDNzcw MF9FVEhfVFhfSU5WX0RFTEFZCUJJVCgxNSkKKyNkZWZpbmUgRUlDNzcwMF9FVEhfUlhfSU5WX0RF TEFZCUJJVCgzMSkKIAogI2RlZmluZSBFSUM3NzAwX01BWF9ERUxBWV9TVEVQUwkJMHg3RgogI2Rl ZmluZSBFSUM3NzAwX0RFTEFZX1NURVBfUFMJCTIwCkBAIC00Myw3ICs0NywxNCBAQCBzdGF0aWMg Y29uc3QgY2hhciAqIGNvbnN0IGVpYzc3MDBfY2xrX25hbWVzW10gPSB7CiAJInR4IiwgImF4aSIs ICJjZmciLAogfTsKIAorc3RydWN0IGVpYzc3MDBfZHdtYWNfZGF0YSB7CisJYm9vbCByZ21paV9y eF9jbGtfaW52ZXJ0OworCWJvb2wgaGFzX2ludGVybmFsX3R4X2RlbGF5OworCXUzMiB0eF9jbGtf aW5oZXJlbnRfc2tld19wczsKK307CisKIHN0cnVjdCBlaWM3NzAwX3Fvc19wcml2IHsKKwlzdHJ1 Y3QgZGV2aWNlICpkZXY7CiAJc3RydWN0IHBsYXRfc3RtbWFjZW5ldF9kYXRhICpwbGF0X2RhdDsK IAlzdHJ1Y3QgcmVnbWFwICplaWM3NzAwX2hzcF9yZWdtYXA7CiAJdTMyIGV0aF9heGlfbHBfY3Ry bF9vZmZzZXQ7CkBAIC01NCw2ICs2NSw3IEBAIHN0cnVjdCBlaWM3NzAwX3Fvc19wcml2IHsKIAl1 MzIgZXRoX2Nsa19kbHlfcGFyYW07CiAJYm9vbCBoYXNfdHhkX29mZnNldDsKIAlib29sIGhhc19y eGRfb2Zmc2V0OworCWJvb2wgZXRoX3J4X2Nsa19pbnY7CiB9OwogCiBzdGF0aWMgaW50IGVpYzc3 MDBfY2xrc19jb25maWcodm9pZCAqcHJpdiwgYm9vbCBlbmFibGVkKQpAQCAtOTcsOSArMTA5LDYg QEAgc3RhdGljIGludCBlaWM3NzAwX2R3bWFjX2luaXQoc3RydWN0IGRldmljZSAqZGV2LCB2b2lk ICpwcml2KQogCWlmIChkd2MtPmhhc19yeGRfb2Zmc2V0KQogCQlyZWdtYXBfd3JpdGUoZHdjLT5l aWM3NzAwX2hzcF9yZWdtYXAsIGR3Yy0+ZXRoX3J4ZF9vZmZzZXQsIDApOwogCi0JcmVnbWFwX3dy aXRlKGR3Yy0+ZWljNzcwMF9oc3BfcmVnbWFwLCBkd2MtPmV0aF9jbGtfb2Zmc2V0LAotCQkgICAg IGR3Yy0+ZXRoX2Nsa19kbHlfcGFyYW0pOwotCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTEyNiw4ICsx MzUsMzggQEAgc3RhdGljIGludCBlaWM3NzAwX2R3bWFjX3Jlc3VtZShzdHJ1Y3QgZGV2aWNlICpk ZXYsIHZvaWQgKnByaXYpCiAJcmV0dXJuIHJldDsKIH0KIAorLyoKKyAqIGV0aDEgcmVxdWlyZXMg UlggY2xvY2sgaW52ZXJzaW9uIGF0IDEwMDBNYnBzIGR1ZSB0byBzaWxpY29uLWluaGVyZW50Cisg KiBSWCBzYW1wbGluZyBza2V3IGF0IE1BQyBpbnB1dC4KKyAqCisgKiBUaGUgY29uZmlndXJhdGlv biBpcyB1cGRhdGVkIGluIGZpeF9tYWNfc3BlZWQoKSBiZWNhdXNlIHRoZSByZXF1aXJlZAorICog c2FtcGxpbmcgYmVoYXZpb3IgZGVwZW5kcyBvbiB0aGUgbmVnb3RpYXRlZCBsaW5rIHNwZWVkLgor ICovCitzdGF0aWMgdm9pZCBlaWM3NzAwX2R3bWFjX2ZpeF9zcGVlZCh2b2lkICpwcml2LCBwaHlf aW50ZXJmYWNlX3QgaW50ZXJmYWNlLAorCQkJCSAgICBpbnQgc3BlZWQsIHVuc2lnbmVkIGludCBt b2RlKQoreworCXN0cnVjdCBlaWM3NzAwX3Fvc19wcml2ICpkd2MgPSAoc3RydWN0IGVpYzc3MDBf cW9zX3ByaXYgKilwcml2OworCXUzMiBkbHlfcGFyYW0gPSBkd2MtPmV0aF9jbGtfZGx5X3BhcmFt OworCisJc3dpdGNoIChzcGVlZCkgeworCWNhc2UgU1BFRURfMTAwMDoKKwkJaWYgKGR3Yy0+ZXRo X3J4X2Nsa19pbnYpCisJCQlkbHlfcGFyYW0gfD0gRUlDNzcwMF9FVEhfUlhfSU5WX0RFTEFZOwor CQlicmVhazsKKwljYXNlIFNQRUVEXzEwMDoKKwljYXNlIFNQRUVEXzEwOgorCQlicmVhazsKKwlk ZWZhdWx0OgorCQlkZXZfd2Fybihkd2MtPmRldiwgInVuc3VwcG9ydGVkIHNwZWVkICV1XG4iLCBz cGVlZCk7CisJCXJldHVybjsKKwl9CisKKwlyZWdtYXBfd3JpdGUoZHdjLT5laWM3NzAwX2hzcF9y ZWdtYXAsIGR3Yy0+ZXRoX2Nsa19vZmZzZXQsIGRseV9wYXJhbSk7Cit9CisKIHN0YXRpYyBpbnQg ZWljNzcwMF9kd21hY19wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogeworCWNv bnN0IHN0cnVjdCBlaWM3NzAwX2R3bWFjX2RhdGEgKmRhdGE7CiAJc3RydWN0IHBsYXRfc3RtbWFj ZW5ldF9kYXRhICpwbGF0X2RhdDsKIAlzdHJ1Y3Qgc3RtbWFjX3Jlc291cmNlcyBzdG1tYWNfcmVz OwogCXN0cnVjdCBlaWM3NzAwX3Fvc19wcml2ICpkd2NfcHJpdjsKQEAgLTE0OCw2ICsxODcsMzAg QEAgc3RhdGljIGludCBlaWM3NzAwX2R3bWFjX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2Ug KnBkZXYpCiAJaWYgKCFkd2NfcHJpdikKIAkJcmV0dXJuIC1FTk9NRU07CiAKKwlkd2NfcHJpdi0+ ZGV2ID0gJnBkZXYtPmRldjsKKworCWRhdGEgPSBkZXZpY2VfZ2V0X21hdGNoX2RhdGEoJnBkZXYt PmRldik7CisJaWYgKCFkYXRhKQorCQlyZXR1cm4gZGV2X2Vycl9wcm9iZSgmcGRldi0+ZGV2LAor CQkJCSAgICAgLUVJTlZBTCwgIm5vIG1hdGNoIGRhdGEgZm91bmRcbiIpOworCisJZHdjX3ByaXYt PmV0aF9yeF9jbGtfaW52ID0gZGF0YS0+cmdtaWlfcnhfY2xrX2ludmVydDsKKwkvKgorCSAqIFRo ZSBNQUMgc2lsaWNvbiB1bmNvbmRpdGlvbmFsbHkgYWRkcyB+MiBucyBUWCBkZWxheTsgcHJldmVu dAorCSAqIHRoZSBQSFkgZnJvbSBhbHNvIGFkZGluZyBUWCBkZWxheSB0byBhdm9pZCBkb3VibGlu ZyBpdC4KKwkgKgorCSAqIERUIHNwZWNpZmllcyByZ21paS1pZCAoVFggZnJvbSBNQUMgc2lsaWNv biwgUlggZnJvbSBQSFkpOworCSAqIG92ZXJyaWRlIHRvIHJnbWlpLXJ4aWQgc28gdGhlIFBIWSBv bmx5IGFkZHMgaXRzIFJYIGRlbGF5LgorCSAqLworCWlmIChkYXRhLT5oYXNfaW50ZXJuYWxfdHhf ZGVsYXkpIHsKKwkJcGxhdF9kYXQtPnBoeV9pbnRlcmZhY2UgPQorCQkJCSBwaHlfZml4X3BoeV9t b2RlX2Zvcl9tYWNfZGVsYXlzKHBsYXRfZGF0LT5waHlfaW50ZXJmYWNlLAorCQkJCQkJCQkgdHJ1 ZSwgZmFsc2UpOworCQlpZiAocGxhdF9kYXQtPnBoeV9pbnRlcmZhY2UgPT0gUEhZX0lOVEVSRkFD RV9NT0RFX05BKQorCQkJcmV0dXJuIGRldl9lcnJfcHJvYmUoJnBkZXYtPmRldiwgLUVJTlZBTCwK KwkJCQkicGh5IGludGVyZmFjZSBtb2RlIGlzIE5BXG4iKTsKKwl9CisKIAkvKiBSZWFkIHJ4LWlu dGVybmFsLWRlbGF5LXBzIGFuZCB1cGRhdGUgcnhfY2xrIGRlbGF5ICovCiAJaWYgKCFvZl9wcm9w ZXJ0eV9yZWFkX3UzMihwZGV2LT5kZXYub2Zfbm9kZSwKIAkJCQkgICJyeC1pbnRlcm5hbC1kZWxh eS1wcyIsICZkZWxheV9wcykpIHsKQEAgLTE2Nyw3ICsyMzAsMTMgQEAgc3RhdGljIGludCBlaWM3 NzAwX2R3bWFjX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJCQkJIEZJRUxE X1BSRVAoRUlDNzcwMF9FVEhfUlhfQURKX0RFTEFZLCB2YWwpOwogCX0KIAotCS8qIFJlYWQgdHgt aW50ZXJuYWwtZGVsYXktcHMgYW5kIHVwZGF0ZSB0eF9jbGsgZGVsYXkgKi8KKwkvKiBSZWFkIHR4 LWludGVybmFsLWRlbGF5LXBzIGFuZCB1cGRhdGUgdHhfY2xrIGRlbGF5LgorCSAqCisJICogRm9y IGVzd2luLGVpYzc3MDAtcW9zLWV0aC1jbGstaW52ZXJzaW9uLCB0aGUgRFQgcHJvcGVydHkgZGVz Y3JpYmVzCisJICogdGhlIGVmZmVjdGl2ZSBUWCBkZWxheSBhdCB0aGUgTUFDIG91dHB1dCwgaW5j bHVkaW5nIHRoZSBpbmhlcmVudAorCSAqIHNpbGljb24gZGVsYXkuIFN1YnRyYWN0IHRoZSBmaXhl ZCBjb21wb25lbnQgdG8gb2J0YWluIHRoZQorCSAqIHByb2dyYW1tYWJsZSBkZWxheSB2YWx1ZS4K KwkgKi8KIAlpZiAoIW9mX3Byb3BlcnR5X3JlYWRfdTMyKHBkZXYtPmRldi5vZl9ub2RlLAogCQkJ CSAgInR4LWludGVybmFsLWRlbGF5LXBzIiwgJmRlbGF5X3BzKSkgewogCQlpZiAoZGVsYXlfcHMg JSBFSUM3NzAwX0RFTEFZX1NURVBfUFMpCkBAIC0xNzUsOSArMjQ0LDE2IEBAIHN0YXRpYyBpbnQg ZWljNzcwMF9kd21hY19wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCQkJCSJ0 eCBkZWxheSBtdXN0IGJlIG11bHRpcGxlIG9mICVkcHNcbiIsCiAJCQkJRUlDNzcwMF9ERUxBWV9T VEVQX1BTKTsKIAorCQlpZiAoZGVsYXlfcHMgPCBkYXRhLT50eF9jbGtfaW5oZXJlbnRfc2tld19w cykKKwkJCXJldHVybiBkZXZfZXJyX3Byb2JlKCZwZGV2LT5kZXYsIC1FSU5WQUwsCisJCQkJInR4 IGRlbGF5ICV1cHMgYmVsb3cgaW5oZXJlbnQgc2tldyAldXBzXG4iLAorCQkJCWRlbGF5X3BzLCBk YXRhLT50eF9jbGtfaW5oZXJlbnRfc2tld19wcyk7CisKKwkJZGVsYXlfcHMgLT0gZGF0YS0+dHhf Y2xrX2luaGVyZW50X3NrZXdfcHM7CisKIAkJaWYgKGRlbGF5X3BzID4gRUlDNzcwMF9NQVhfREVM QVlfUFMpCiAJCQlyZXR1cm4gZGV2X2Vycl9wcm9iZSgmcGRldi0+ZGV2LCAtRUlOVkFMLAotCQkJ CSJ0eCBkZWxheSBvdXQgb2YgcmFuZ2VcbiIpOworCQkJCSJ0eCBkZWxheSBvdXQgb2YgcHJvZ3Jh bW1hYmxlIHJhbmdlXG4iKTsKIAogCQl2YWwgPSBkZWxheV9wcyAvIEVJQzc3MDBfREVMQVlfU1RF UF9QUzsKIApAQCAtMjU0LDEyICszMzAsMzEgQEAgc3RhdGljIGludCBlaWM3NzAwX2R3bWFjX3By b2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJcGxhdF9kYXQtPmV4aXQgPSBlaWM3 NzAwX2R3bWFjX2V4aXQ7CiAJcGxhdF9kYXQtPnN1c3BlbmQgPSBlaWM3NzAwX2R3bWFjX3N1c3Bl bmQ7CiAJcGxhdF9kYXQtPnJlc3VtZSA9IGVpYzc3MDBfZHdtYWNfcmVzdW1lOworCXBsYXRfZGF0 LT5maXhfbWFjX3NwZWVkID0gZWljNzcwMF9kd21hY19maXhfc3BlZWQ7CiAKIAlyZXR1cm4gZGV2 bV9zdG1tYWNfcGx0ZnJfcHJvYmUocGRldiwgcGxhdF9kYXQsICZzdG1tYWNfcmVzKTsKIH0KIAor c3RhdGljIGNvbnN0IHN0cnVjdCBlaWM3NzAwX2R3bWFjX2RhdGEgZWljNzcwMF9kd21hY19kYXRh ID0geworCS5yZ21paV9yeF9jbGtfaW52ZXJ0ID0gZmFsc2UsCisJLmhhc19pbnRlcm5hbF90eF9k ZWxheSA9IGZhbHNlLAorCS50eF9jbGtfaW5oZXJlbnRfc2tld19wcyA9IDAsCit9OworCitzdGF0 aWMgY29uc3Qgc3RydWN0IGVpYzc3MDBfZHdtYWNfZGF0YSBlaWM3NzAwX2R3bWFjX2RhdGFfY2xr X2ludmVyc2lvbiA9IHsKKwkucmdtaWlfcnhfY2xrX2ludmVydCA9IHRydWUsCisJLmhhc19pbnRl cm5hbF90eF9kZWxheSA9IHRydWUsCisJLnR4X2Nsa19pbmhlcmVudF9za2V3X3BzID0gMjAwMCwK K307CisKIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkIGVpYzc3MDBfZHdtYWNfbWF0 Y2hbXSA9IHsKLQl7IC5jb21wYXRpYmxlID0gImVzd2luLGVpYzc3MDAtcW9zLWV0aCIgfSwKKwl7 CS5jb21wYXRpYmxlID0gImVzd2luLGVpYzc3MDAtcW9zLWV0aCIsCisJCS5kYXRhID0gJmVpYzc3 MDBfZHdtYWNfZGF0YSwKKwl9LAorCXsKKwkJLmNvbXBhdGlibGUgPSAiZXN3aW4sZWljNzcwMC1x b3MtZXRoLWNsay1pbnZlcnNpb24iLAorCQkuZGF0YSA9ICZlaWM3NzAwX2R3bWFjX2RhdGFfY2xr X2ludmVyc2lvbiwKKwl9LAogCXsgfQogfTsKIE1PRFVMRV9ERVZJQ0VfVEFCTEUob2YsIGVpYzc3 MDBfZHdtYWNfbWF0Y2gpOwotLSAKMi4yNS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KbGludXgtcmlzY3YgbWFpbGluZyBsaXN0CmxpbnV4LXJpc2N2 QGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9s aXN0aW5mby9saW51eC1yaXNjdgo=