From patchwork Thu Dec 21 02:09:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 181943 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2483:b0:fb:cd0c:d3e with SMTP id q3csp137520dyi; Wed, 20 Dec 2023 18:10:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IF5VkZHi3OoQZiia5GRB5f4P41uZxRTnmbL35JmaA4JN0Y512kPimzjobPoCC+pMkX+LCuI X-Received: by 2002:a17:902:a3c7:b0:1d3:c568:589f with SMTP id q7-20020a170902a3c700b001d3c568589fmr3873672plb.103.1703124616643; Wed, 20 Dec 2023 18:10:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703124616; cv=none; d=google.com; s=arc-20160816; b=rhMywz5+WdzoL/zsqdpqWFt9tnX9f5CirNKfpRTdSBQja/VCX3HqrRbDj7TMrIErNF TPuAdwOGo+lpAT4kPScuwpJ76nBEW7B0NnOgPX9zdBTDGTsVNbnRpaJexdGjHh/K7VQH r2Q2Fq6TDuND3qrjl85jM3wD9edj2ZUCzmrEafyD8tAeS/YdjWVif/l3sUY28t0Iz19z 7WKjwbPVRfgXuUhSpmWyXGRZJU7UsZtZ2S8yPjq8vo10FOOIPzy5u5qNFFvKleEN26In zDrVPs5Mg1sh27WEWTLZ0/N1zW8BPESuI6jCHhAPRRBX0J6UleTLGAwD9N3+NXceUSh7 1CQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=SQPj3HUnBXBdCf7DMtt5ufwXC9cul2cKhzw9rtRPKJE=; fh=aTOyus4LEwrk9/To8oPMup1ErHCnxiPNsei4Tmmq6y0=; b=J18/rBDo/hGm9ASAqUCI6lnSkqAWz2dEBGj4ronehDfguIUlEtYeHksHvVPfJ7hcK2 DbCHTP3tsrJCCzNeBfIOnfQ9ZmyP8793i9QDTxf+NUJ6OmGo8qroLbT1XYpUh++pXBmF NNSIvpb9BNmH5lbwI8UXOKQ+PT9XfYSSGpmCUonPgp9LavgWkovusXjOsqNIy9AZtIKq ZY0Hd2HpXyy47c8tHv7niq+q2DFjdyCNLYmtJ3FKTnp6UCj960dg5q7LN8pUfomZy4yp LUvOHAOYxmjb0+vncKnHVPg0RcVz2XrPDy9kFoDZpC4g5VH1qRnPp+tJDskQD24xdgSQ xJEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Aubdeicm; spf=pass (google.com: domain of linux-kernel+bounces-7744-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7744-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id jh9-20020a170903328900b001d2e6c3f136si638425plb.96.2023.12.20.18.10.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 18:10:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-7744-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Aubdeicm; spf=pass (google.com: domain of linux-kernel+bounces-7744-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-7744-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 66B702876A6 for ; Thu, 21 Dec 2023 02:10:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DC5A24A19; Thu, 21 Dec 2023 02:09:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Aubdeicm" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 D8B5A184C; Thu, 21 Dec 2023 02:09:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1703124588; bh=SQPj3HUnBXBdCf7DMtt5ufwXC9cul2cKhzw9rtRPKJE=; h=Date:From:To:Cc:Subject:From; b=AubdeicmHTt5iSFlzJ8q1Whh+nIKxNLzB1hHPTAG1T6csV54TNdKExwM7OCexL3lo Zdlox/qu+Ajls/2/b7XOfFUdeEHWseHuSXQzpDM4oWpvED/CltUgR81ZuvOwvzGJAT q9nJaskMIcE3w2WWJFVdAP2I7pwKPtKp2Q5QF/bQabertGbnNQyDfJZQUPmm3R+wh3 FY9hv4DGvuHSmJPx5Y51nyXh20RZoU1eZovPydtpnKl2IA5cq/f4MkOgwaYYvzbGSk 5XVeYibhsm6bdoKcPbtcv08mRi9c9OThfksonBJ0uOaqk2aXluIFrZI+/UI3d2omnJ H45xYKNguSBlg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SwYlv5Xgvz4xGC; Thu, 21 Dec 2023 13:09:47 +1100 (AEDT) Date: Thu, 21 Dec 2023 13:09:46 +1100 From: Stephen Rothwell To: David Miller , Jakub Kicinski , Paolo Abeni , Andrew Morton Cc: Networking , Mathis Marion , Christian Marangi , Robert Marko , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the net-next tree Message-ID: <20231221130946.7ed9a805@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785855597733527343 X-GMAIL-MSGID: 1785855597733527343 Hi all, After merging the net-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/phy/aquantia/aquantia_firmware.c: In function 'aqr_fw_load_memory': drivers/net/phy/aquantia/aquantia_firmware.c:135:23: error: implicit declaration of function 'crc_ccitt_false'; did you mean 'crc_ccitt_byte'? [-Werror=implicit-function-declaration] 135 | crc = crc_ccitt_false(crc, crc_data, sizeof(crc_data)); | ^~~~~~~~~~~~~~~ | crc_ccitt_byte Caused by commit e93984ebc1c8 ("net: phy: aquantia: add firmware load support") interacting with commit 56ded2dd1a43 ("lib: crc_ccitt_false() is identical to crc_itu_t()") from the mm tree. I have applied the following merge fix patch: From: Stephen Rothwell Date: Thu, 21 Dec 2023 12:49:11 +1100 Subject: [PATCH] fix up for "net: phy: aquantia: add firmware load support" interacting with commit 56ded2dd1a43 ("lib: crc_ccitt_false() is identical to crc_itu_t()") from the mm tree. Signed-off-by: Stephen Rothwell --- drivers/net/phy/aquantia/Kconfig | 2 +- drivers/net/phy/aquantia/aquantia_firmware.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/phy/aquantia/Kconfig b/drivers/net/phy/aquantia/Kconfig index a35de4b9b554..1a65678583cf 100644 --- a/drivers/net/phy/aquantia/Kconfig +++ b/drivers/net/phy/aquantia/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only config AQUANTIA_PHY tristate "Aquantia PHYs" - select CRC_CCITT + select CRC_ITU_T help Currently supports the Aquantia AQ1202, AQ2104, AQR105, AQR405 diff --git a/drivers/net/phy/aquantia/aquantia_firmware.c b/drivers/net/phy/aquantia/aquantia_firmware.c index ff34d00d5a0e..0c9640ef153b 100644 --- a/drivers/net/phy/aquantia/aquantia_firmware.c +++ b/drivers/net/phy/aquantia/aquantia_firmware.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include @@ -132,7 +132,7 @@ static int aqr_fw_load_memory(struct phy_device *phydev, u32 addr, crc_data[3] = word; /* ...calculate CRC as we load data... */ - crc = crc_ccitt_false(crc, crc_data, sizeof(crc_data)); + crc = crc_itu_t(crc, crc_data, sizeof(crc_data)); } /* ...gets CRC from MAILBOX after we have loaded the entire section... */ up_crc = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_MAILBOX_INTERFACE2); @@ -164,7 +164,7 @@ static int aqr_fw_boot(struct phy_device *phydev, const u8 *data, size_t size, phydev_err(phydev, "bad firmware CRC in firmware\n"); return ret; } - calculated_crc = crc_ccitt_false(0, data, size - sizeof(u16)); + calculated_crc = crc_itu_t(0, data, size - sizeof(u16)); if (read_crc != calculated_crc) { phydev_err(phydev, "bad firmware CRC: file 0x%04x calculated 0x%04x\n", read_crc, calculated_crc);