From nobody Mon May 11 02:55:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41870C433EF for ; Sun, 17 Apr 2022 17:55:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234666AbiDQR5e (ORCPT ); Sun, 17 Apr 2022 13:57:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233437AbiDQR50 (ORCPT ); Sun, 17 Apr 2022 13:57:26 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D84DACD5 for ; Sun, 17 Apr 2022 10:54:49 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id i27so23510438ejd.9 for ; Sun, 17 Apr 2022 10:54:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sZTBfR/A89syNfUStFLmnUWCQR/KrbeiEyXxR04D+i4=; b=JbNAEqTXiQowm2n17xTXw3p55q/678/g4P2W8R2+Gq8DZeXcdqZKHqBnon1GuG6Rco e+gzkl0dUhLAp/TcbnXCaju0oWLkNLeHKiTQrWVZ2ORSxBWhtPvMQgBFM7qmM7hsgsP0 WdADsG+v+sECo5fkpt0CapJF6C8QFMK4XmpS+2m1fcqEl9vbDMuIKrhBQk+KQ24OL21U PlbPKzuwYFpsSowSiSBIusykAvZUxwvCaxt5ihrYNeimVQO4X+1reeb1I5oHP+F8aFFk mCKF8hm0HWf+WVYEZnunVTD9eLk/rVRJRUoeMRiMp/IW64KXsdbvjeAPr/Mnc3yl59SF ID8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sZTBfR/A89syNfUStFLmnUWCQR/KrbeiEyXxR04D+i4=; b=oDEGDpPR7HIl8yNKrF8iwm3Oo7zBFuaEl71Ey7YjXAZw77Oo6tEIJ2XSQlkXOd9MW9 48OR60T3ml5SkP/ZfZUPHaxvkrm1fyLpUT45PpO7lXuPJaxZlyZ1yLw04W4663UN7eE1 lP2Dguc/CSr6W1HD7LLRu+Zlc8FEkRwoJ6OOFQiy6he8fyrx0G7w/8NlEzeRh3lPg9VA dMpdJ/QmDRk9gzajTZKgttoV87SsAzPhMG9JJFkaKMVzvq8WracmaQKLe5CnnKREBIkW K1lk80I/6t5XPUoQ8fYRq313C32nQ8BGqD2q8PIjSdsJeBmFxkPB02/98XUEy3Noa38A nitw== X-Gm-Message-State: AOAM5312Gf4XbvSbgE8dFViia7lLdlvjKKDZmelZouuUsXruaGsuNOXK pLZsIPdXr48Qxht5MRPFkUk= X-Google-Smtp-Source: ABdhPJwXoFfnrFhj0GsJ8c2wFNj++cwxFiLjiiIn68WECW8SJS8vyxTlSYWX4RZpIp6goCLoEzlxXA== X-Received: by 2002:a17:907:948b:b0:6d8:27f8:ab4a with SMTP id dm11-20020a170907948b00b006d827f8ab4amr6363899ejc.39.1650218088398; Sun, 17 Apr 2022 10:54:48 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id jw12-20020a17090776ac00b006e87137194esm3719409ejc.150.2022.04.17.10.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 10:54:47 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v4 1/8] staging: r8188eu: fix struct rt_firmware_hdr Date: Sun, 17 Apr 2022 19:54:34 +0200 Message-Id: <20220417175441.13830-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220417175441.13830-1-straube.linux@gmail.com> References: <20220417175441.13830-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The size of struct rt_firmware_hdr is 36 bytes. $ pahole -C rt_firmware_hdr drivers/staging/r8188eu/r8188eu.o struct rt_firmware_hdr { __le16 Signature; /* 0 2 */ u8 Category; /* 2 1 */ u8 Function; /* 3 1 */ __le16 Version; /* 4 2 */ u8 Subversion; /* 6 1 */ /* XXX 1 byte hole, try to pack */ u16 Rsvd1; /* 8 2 */ u8 Month; /* 10 1 */ u8 Date; /* 11 1 */ u8 Hour; /* 12 1 */ u8 Minute; /* 13 1 */ __le16 RamCodeSize; /* 14 2 */ u8 Foundry; /* 16 1 */ u8 Rsvd2; /* 17 1 */ /* XXX 2 bytes hole, try to pack */ __le32 SvnIdx; /* 20 4 */ u32 Rsvd3; /* 24 4 */ u32 Rsvd4; /* 28 4 */ u32 Rsvd5; /* 32 4 */ /* size: 36, cachelines: 1, members: 17 */ /* sum members: 33, holes: 2, sum holes: 3 */ /* last cacheline: 36 bytes */ }; But the header in the firmware file is only 32 bytes long. The hexdump of rtl8188eufw.bin shows that the field Rsvd1 should be u8 instead of __le16. OFFSET rtl8188eufw.bin Acked-by: Larry Finger ----------------------------------------------------------- 0x00000000 E1 88 10 00 0B 00 01 00 01 21 11 27 30 36 00 00 0x00000010 2D 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x00000000 E1 88 10 00 0B 00 01 00 01 21 11 27 30 36 00 00 ^ ^ ^ ^ ^ ^ Subversion Rsvd1 Month Date Hour Minute With the change of field Rsvd1 from __le16 to u8 the structure has the correct size 32. $ pahole -C rt_firmware_hdr drivers/staging/r8188eu/r8188eu.o struct rt_firmware_hdr { __le16 Signature; /* 0 2 */ u8 Category; /* 2 1 */ u8 Function; /* 3 1 */ __le16 Version; /* 4 2 */ u8 Subversion; /* 6 1 */ u8 Rsvd1; /* 7 1 */ u8 Month; /* 8 1 */ u8 Date; /* 9 1 */ u8 Hour; /* 10 1 */ u8 Minute; /* 11 1 */ __le16 RamCodeSize; /* 12 2 */ u8 Foundry; /* 14 1 */ u8 Rsvd2; /* 15 1 */ __le32 SvnIdx; /* 16 4 */ u32 Rsvd3; /* 20 4 */ u32 Rsvd4; /* 24 4 */ u32 Rsvd5; /* 28 4 */ /* size: 32, cachelines: 1, members: 17 */ /* last cacheline: 32 bytes */ The wrong size had no effect because the header size is hardcoded to 32 where it is used in the code and the fields after Subversion are not used. Fixes: 7884fc0a1473 ("staging: r8188eu: introduce new include dir for RTL81= 88eu driver") Signed-off-by: Michael Straube --- v4: - no changes v3: - updated the commit message - moved the u32 to __le32 conversions to a separate patch v2: - no changes drivers/staging/r8188eu/core/rtw_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 8620f3c92b52..eb4ab11f6b28 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -29,7 +29,7 @@ struct rt_firmware_hdr { * FW for different conditions */ __le16 Version; /* FW Version */ u8 Subversion; /* FW Subversion, default 0x00 */ - u16 Rsvd1; + u8 Rsvd1; =20 /* LONG WORD 1 ---- */ u8 Month; /* Release time Month field */ --=20 2.35.1 From nobody Mon May 11 02:55:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1A3BC433EF for ; Sun, 17 Apr 2022 17:55:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234695AbiDQR5o (ORCPT ); Sun, 17 Apr 2022 13:57:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234336AbiDQR50 (ORCPT ); Sun, 17 Apr 2022 13:57:26 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A775D71 for ; Sun, 17 Apr 2022 10:54:50 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id t11so23482179eju.13 for ; Sun, 17 Apr 2022 10:54:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=88taCigWH9mYhbbUWC8GxUjVzrfbEewXNsQRIQG981U=; b=B08AYVFeW3NYEqrd2gEUo6LRdIIpXceAPrNO0xE83cntgkSQC8qpKpZZ4cLeyqU0hu A2srZdJc4QmaxOxY8f2vmxDA2TCi55mNXJazZGr2qvy+XknS6rnAZZTXbXl5sw9pZTie NOBWcTcT4VsCmF67fHL3H/oXr2uuqbxreDSCGPfF8YfImoYPy3luOAPSIOY8BQNR8fzN 5e0QxKaOh64rfjqGd7xiCd2TMIbzo72s1W1QRgATOxha2Zokl8r+RVOByP8t2gz5S3Jy k4NFNQNk+7+09JHLa4QX3XYi1w10ezhJUY4ikc+sI/a2dHYUKE0KysNrloVs7WpaceFb 4M+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=88taCigWH9mYhbbUWC8GxUjVzrfbEewXNsQRIQG981U=; b=KJ6VBEafAqvREhLinIwajohtXbApOptLZvMIyGg7e+yuPfh4HHG61ITuKkm90zeogI EJSwhahIn7yjZkQWhNyvRHSotvTW8ZRXdNJm5pq9aLTVMcWDQFmxU1vWoXW5fR1MZfJ2 cRECOw0+26wUJG0FpbdY9m9+DIIB6pT/Zns9PE+PH6tqmRH0rarlIaiwK2V+Gq+Imfnu gfeb75oPzKHG7A1HOJaGj2c/saGLvymvOsAGPlnbjei/FJb3D+CUGhvwJgEcZ4L1ajGZ 14FMHTW8gMvU4fUepDNr//nfUigQyjtrYrZBwKzs/ftNQoShTV1XHiNKxM8U1bwqU8A5 KXlQ== X-Gm-Message-State: AOAM532biNRKW++k8G6fOAv2XswtmdF0maxz0UDqMi1tUpKA6PUT9XgF CXz9BPzKKu4L2fD/wk/RDx0= X-Google-Smtp-Source: ABdhPJwu7a4ODeJTadJJdUNYffpNWAr9ewqlhTQVuaRqB7l2lxcQ7DeH7c6/PmtyLbEE5V22+4fF3g== X-Received: by 2002:a17:906:7684:b0:6e8:5d05:196b with SMTP id o4-20020a170906768400b006e85d05196bmr6492880ejm.209.1650218089065; Sun, 17 Apr 2022 10:54:49 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id jw12-20020a17090776ac00b006e87137194esm3719409ejc.150.2022.04.17.10.54.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 10:54:48 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v4 2/8] staging: r8188eu: convert u32 fields of rt_firmware_hdr to __le32 Date: Sun, 17 Apr 2022 19:54:35 +0200 Message-Id: <20220417175441.13830-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220417175441.13830-1-straube.linux@gmail.com> References: <20220417175441.13830-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Convert the u32 fields of struct rt_firmware_hdr to __le32 for consistency. Signed-off-by: Michael Straube Acked-by: Larry Finger --- v4: - no changes v3: - this patch was part of patch 1/8 in v2 drivers/staging/r8188eu/core/rtw_fw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index eb4ab11f6b28..7cd08268f3b9 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -42,11 +42,11 @@ struct rt_firmware_hdr { =20 /* LONG WORD 2 ---- */ __le32 SvnIdx; /* The SVN entry index */ - u32 Rsvd3; + __le32 Rsvd3; =20 /* LONG WORD 3 ---- */ - u32 Rsvd4; - u32 Rsvd5; + __le32 Rsvd4; + __le32 Rsvd5; }; =20 static void fw_download_enable(struct adapter *padapter, bool enable) --=20 2.35.1 From nobody Mon May 11 02:55:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 420EBC433F5 for ; Sun, 17 Apr 2022 17:55:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234689AbiDQR5l (ORCPT ); Sun, 17 Apr 2022 13:57:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234659AbiDQR52 (ORCPT ); Sun, 17 Apr 2022 13:57:28 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FB4BE1F for ; Sun, 17 Apr 2022 10:54:51 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id v4so15343985edl.7 for ; Sun, 17 Apr 2022 10:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YHM9PFFwx6hClGPcuoJgSs1Sb6xb089x4uMzIqzHgxE=; b=Yp56c+ZB8HEv1qF30A4KlgnajiNfkp/end5U3doacovPJEmHPgB5M6jLXBAj6iHqYp 9R3CjqP3XpBeMvY0D1uc4/D1k9NcvvT/5P/SB18egXGckfj+qK4SIuldWJftfnXDetPP oixZVm9mHe0rEIgR4YkuTxhJ5SwWJM3vOwqLNJXkihF3CQKhO2IwGHj2AIOJjnJBCvvc XCvs40JMYYhGizciLG+mwnPww5IYMX/0bJWrF+c31+UlY4IO+4CsLNAI6bTu9le4JEBf NtSAcjkyQyPB2TCehsBPWANsEfo9C7Qjpxh3uDHTPYc88z3opIRcxISWAXtprEXNZzEa kNuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YHM9PFFwx6hClGPcuoJgSs1Sb6xb089x4uMzIqzHgxE=; b=mZuR5dHeI5C2Z/1LbHujZoNutuYqXKYuFmuTZQ3+JdeFxrHkm5qnbo86j27EicIqhB itgyoTGR+BhaAfVaoWQdAGzvD+CqHoc2aU8hvQnoBvFCz3F6RSLLd/J6HkjkgViN9SAe sGK7tQYjby7WHnEP0ZP5kIZe2nob7WjKKfPa6O9/Vr5P5vhJ/Lhw9AU+WOrZg+olMSGM Aum2jyTOPpFNo5NnpPEL19ZzS75aLnYPTTwhhWNWh0Y71RAeamZnlP18D/Qba0irVuJw 8RizKrpTqjV84C+QivM3WZHJm5msqhjdMF6bK/D1d2j/9Ckn7B7AIsNVNviNLJjw8R/J W9DQ== X-Gm-Message-State: AOAM532L+bTnRqq9pO2VQn2zQFoyDQDCrba82ZI9urw1z+7kerlohqhc MnGdWpNuN9+kx9YZK094QEA= X-Google-Smtp-Source: ABdhPJzpsqelcEFavErmiQTZY9Yba+1II7W/RaX2sY5D0MrTifQjwSVy8Q2XdtxzQbs85AIktc1GBw== X-Received: by 2002:aa7:dcd3:0:b0:41d:70e4:bf4d with SMTP id w19-20020aa7dcd3000000b0041d70e4bf4dmr8649818edu.223.1650218089830; Sun, 17 Apr 2022 10:54:49 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id jw12-20020a17090776ac00b006e87137194esm3719409ejc.150.2022.04.17.10.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 10:54:49 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v4 3/8] staging: r8188eu: clean up comments in struct rt_firmware_hdr Date: Sun, 17 Apr 2022 19:54:36 +0200 Message-Id: <20220417175441.13830-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220417175441.13830-1-straube.linux@gmail.com> References: <20220417175441.13830-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove unnecessary comments from struct rt_firmware_hdr. While at it align the in-line comments. Signed-off-by: Michael Straube Acked-by: Larry Finger --- v4: - keep the in-line comments v3: - no changes v2: - no changes drivers/staging/r8188eu/core/rtw_fw.c | 36 ++++++++++----------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 7cd08268f3b9..0fa27b36bb8e 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -14,37 +14,27 @@ (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x2300 || \ (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88E0) =20 -/* This structure must be careful with byte-ordering */ - struct rt_firmware_hdr { - /* 8-byte alinment required */ - /* LONG WORD 0 ---- */ __le16 Signature; /* 92C0: test chip; 92C, * 88C0: test chip; 88C1: MP A-cut; * 92C1: MP A-cut */ - u8 Category; /* AP/NIC and USB/PCI */ - u8 Function; /* Reserved for different FW function - * indcation, for further use when - * driver needs to download different - * FW for different conditions */ - __le16 Version; /* FW Version */ - u8 Subversion; /* FW Subversion, default 0x00 */ + u8 Category; /* AP/NIC and USB/PCI */ + u8 Function; /* Reserved for different FW function + * indcation, for further use when + * driver needs to download different + * FW for different conditions */ + __le16 Version; /* FW Version */ + u8 Subversion; /* FW Subversion, default 0x00 */ u8 Rsvd1; - - /* LONG WORD 1 ---- */ - u8 Month; /* Release time Month field */ - u8 Date; /* Release time Date field */ - u8 Hour; /* Release time Hour field */ - u8 Minute; /* Release time Minute field */ - __le16 RamCodeSize; /* The size of RAM code */ + u8 Month; /* Release time Month field */ + u8 Date; /* Release time Date field */ + u8 Hour; /* Release time Hour field */ + u8 Minute; /* Release time Minute field */ + __le16 RamCodeSize; /* The size of RAM code */ u8 Foundry; u8 Rsvd2; - - /* LONG WORD 2 ---- */ - __le32 SvnIdx; /* The SVN entry index */ + __le32 SvnIdx; /* The SVN entry index */ __le32 Rsvd3; - - /* LONG WORD 3 ---- */ __le32 Rsvd4; __le32 Rsvd5; }; --=20 2.35.1 From nobody Mon May 11 02:55:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59946C433F5 for ; Sun, 17 Apr 2022 17:55:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234710AbiDQR5t (ORCPT ); Sun, 17 Apr 2022 13:57:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234660AbiDQR52 (ORCPT ); Sun, 17 Apr 2022 13:57:28 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2486C1115 for ; Sun, 17 Apr 2022 10:54:52 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id g18so23490410ejc.10 for ; Sun, 17 Apr 2022 10:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kkM9doiA/i7FmCkoWkaNp3fDJvZEfu53FAG4JMLkpr4=; b=RtG8TW745DqgPExo3dLdT274i4DPwhvzS6YADILJsm7uTpZLHqKUoKfyCBArXBD9Tk ZTM/U4QTwmQa6Fw+KTYKGLB8uEC41qoS4ZmY8mKXmmOGDO9Zw/s+z2RVAmI7QtVCwTiA Ra5O+ASfyv10lkvKOEMtoT5mj4TuSi0mfX3vOdnco50gf6bhQpGKoFZjIQZQ+RFE5LtX 1YpYMM/r8JPNiCrRhvDv2GGtQwHCDM1XbhJ+bHrlPLqgrb4+GA/MrWG9wHJ8r8X6k/Vt TgkjNPf7deXW1c49vxFXbcETDdz3Zu+p9vXZmqakrJNFd6iiUciyU5McCiNsdWgNixNt KCOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kkM9doiA/i7FmCkoWkaNp3fDJvZEfu53FAG4JMLkpr4=; b=NTbILxIfHDafLu6ZMnYuNw6xi9mx8YMVIev9ygIOqJenlmHrON3KN5daoi0tPPiE5/ 574pTQ/XOHoSfAORHFe4oCX7NbHAEf/oglfE4UFW50lAoRpZVCk//8iFwMZWrZyVU03j 7v/mXcueUVYYVDq9iMNpqdtwhiWgRvoc57xcvJNcaIMF1ZDBb7ELI0Iz6YjXydB5Bk6V W4jgjWxzegIJRVegc3wnrG5p43DUqFL/p0cUipcMINEhnGeaN908Tl9ITA8hjmdor94d DsMbtLSaTf0QkDSzCBOMmP0KJ6GQP0OZoAZJV6SWFLTCKAiDcQBj1uCYjPr67mkjXXXs sq/g== X-Gm-Message-State: AOAM530jN7uyJO1dObAaQLYPj4F4tv8SlY/dvu8858ccFnIWOraGt/hB 7qy9yz6s6CELtwDp36/tzlM= X-Google-Smtp-Source: ABdhPJzB8V3WpMAzb62sj1vfrrDR4r0Prc0w9mfdMeUWGpI6008RYHpAgn1+pXQoM3Fu0fdY3kEl0w== X-Received: by 2002:a17:906:3c10:b0:6e8:9e25:5156 with SMTP id h16-20020a1709063c1000b006e89e255156mr6473926ejg.703.1650218090694; Sun, 17 Apr 2022 10:54:50 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id jw12-20020a17090776ac00b006e87137194esm3719409ejc.150.2022.04.17.10.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 10:54:50 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v4 4/8] staging: r8188eu: rename fields of struct rt_firmware_hdr Date: Sun, 17 Apr 2022 19:54:37 +0200 Message-Id: <20220417175441.13830-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220417175441.13830-1-straube.linux@gmail.com> References: <20220417175441.13830-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rename the fields of struct rt_firmware_hdr to avoid camel case. Signed-off-by: Michael Straube Acked-by: Larry Finger --- v4: - no changes v3: - no changes v2: - no changes drivers/staging/r8188eu/core/rtw_fw.c | 58 +++++++++++++-------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 0fa27b36bb8e..a80cc7fa3a53 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -9,34 +9,34 @@ #define MAX_PAGE_SIZE 4096 =20 #define IS_FW_HEADER_EXIST(_fwhdr) \ - ((le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x92C0 || \ - (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88C0 || \ - (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x2300 || \ - (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88E0) + ((le16_to_cpu(_fwhdr->signature) & 0xFFF0) =3D=3D 0x92C0 || \ + (le16_to_cpu(_fwhdr->signature) & 0xFFF0) =3D=3D 0x88C0 || \ + (le16_to_cpu(_fwhdr->signature) & 0xFFF0) =3D=3D 0x2300 || \ + (le16_to_cpu(_fwhdr->signature) & 0xFFF0) =3D=3D 0x88E0) =20 struct rt_firmware_hdr { - __le16 Signature; /* 92C0: test chip; 92C, - * 88C0: test chip; 88C1: MP A-cut; - * 92C1: MP A-cut */ - u8 Category; /* AP/NIC and USB/PCI */ - u8 Function; /* Reserved for different FW function - * indcation, for further use when - * driver needs to download different - * FW for different conditions */ - __le16 Version; /* FW Version */ - u8 Subversion; /* FW Subversion, default 0x00 */ - u8 Rsvd1; - u8 Month; /* Release time Month field */ - u8 Date; /* Release time Date field */ - u8 Hour; /* Release time Hour field */ - u8 Minute; /* Release time Minute field */ - __le16 RamCodeSize; /* The size of RAM code */ - u8 Foundry; - u8 Rsvd2; - __le32 SvnIdx; /* The SVN entry index */ - __le32 Rsvd3; - __le32 Rsvd4; - __le32 Rsvd5; + __le16 signature; /* 92C0: test chip; 92C, + * 88C0: test chip; 88C1: MP A-cut; + * 92C1: MP A-cut */ + u8 category; /* AP/NIC and USB/PCI */ + u8 function; /* Reserved for different FW function + * indcation, for further use when + * driver needs to download different + * FW for different conditions */ + __le16 version; /* FW Version */ + u8 subversion; /* FW Subversion, default 0x00 */ + u8 rsvd1; + u8 month; /* Release time Month field */ + u8 date; /* Release time Date field */ + u8 hour; /* Release time Hour field */ + u8 minute; /* Release time Minute field */ + __le16 ramcodesize; /* The size of RAM code */ + u8 foundry; + u8 rsvd2; + __le32 svnidx; /* The SVN entry index */ + __le32 rsvd3; + __le32 rsvd4; + __le32 rsvd5; }; =20 static void fw_download_enable(struct adapter *padapter, bool enable) @@ -259,9 +259,9 @@ int rtl8188e_firmware_download(struct adapter *padapter) /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr =3D (struct rt_firmware_hdr *)dvobj->firmware.data; =20 - fw_version =3D le16_to_cpu(fwhdr->Version); - fw_subversion =3D fwhdr->Subversion; - fw_signature =3D le16_to_cpu(fwhdr->Signature); + fw_version =3D le16_to_cpu(fwhdr->version); + fw_subversion =3D fwhdr->subversion; + fw_signature =3D le16_to_cpu(fwhdr->signature); =20 if (!log_version++) pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", --=20 2.35.1 From nobody Mon May 11 02:55:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A797DC433F5 for ; Sun, 17 Apr 2022 17:55:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234702AbiDQR5y (ORCPT ); Sun, 17 Apr 2022 13:57:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234661AbiDQR52 (ORCPT ); Sun, 17 Apr 2022 13:57:28 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9B04265D for ; Sun, 17 Apr 2022 10:54:52 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id i27so23510615ejd.9 for ; Sun, 17 Apr 2022 10:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KEwI6Q2gOou7SmTI/FqsvAk6CZ0LfOMwOSJ78RsRzQU=; b=f1hqZGQ45cLUIX4T7+k+y5bWOaM56L8Ky5XIxmSLUcfM6j44rehlQN4I2SnvpjLWLn 2C8Em2U1LMqmE4jiJohYaTusIMNYtwaQ7QCKZWAmQL82bH8ivAQuc9Bdh5jQAUNkrCxX ICQtx8aUKxBU29PvM9tzLb+VK4AViNQsNNnGl1vl+i4mxiYPn3uZUpSW3giLxZcrUnje 4PbzUYmdnS3jBGc+Az7+gBPtZOpvWeDA55kxUyCIQLXFZlRfKyyxgzG6Co/ifuPRVrOn 3Cu8PUTOuyDCsiydm15MK74Azo38PYXun3l996GX/YYXle7jFmHDbPW4kVbuEFBePY3D vJYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KEwI6Q2gOou7SmTI/FqsvAk6CZ0LfOMwOSJ78RsRzQU=; b=RnK9hvj5E4RSy5xPnjPAYuhs+PA1uXUZhNKyvZBSxEkOuN4Fb7e8NF8u3PGuVzAhWn 8t3hjEk+KxKb/k4ueMOmuYH5h1/d/j0Gh2sTvb7ekq+gfG80L7u4Z0QqoSG8JfXZOzpi rsw5fPSfuKvwA62agQrVYZ1L3kKI9+vrZWRyqkVlsQxyTpX/Npa8tou/HzjzuQ/RS5n0 Pj8Gc/9abmlBQ0ZXsOIyyxEd/72Ekn7Jegjnq26ewh+ZZP9vQ6fu3qQORxs9Rg/mMHnZ gVoPSiAAw3HTPNu35fZcOxlM5S/Q0tEZ/g79yzOAxknDGVUXUY3Ij2GNm+Aq7llOcm8H WzIQ== X-Gm-Message-State: AOAM533nzemt7kQeafMxqIdsfb64h0+n0H6AriGxFSg+l1eqeYuuSDC9 ooHTq8nVqHw65nUs63Row+w= X-Google-Smtp-Source: ABdhPJwE+VrcsnQ6WcjEACvgNW7r1oitmbIaM/2BJUEx5VgdhGMNEDE/7GOxvqEOyRIv5koX3YI3dw== X-Received: by 2002:a17:906:16cc:b0:6ce:e607:ff02 with SMTP id t12-20020a17090616cc00b006cee607ff02mr6117957ejd.418.1650218091437; Sun, 17 Apr 2022 10:54:51 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id jw12-20020a17090776ac00b006e87137194esm3719409ejc.150.2022.04.17.10.54.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 10:54:51 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v4 5/8] staging: r8188eu: use sizeof instead of hardcoded firmware header size Date: Sun, 17 Apr 2022 19:54:38 +0200 Message-Id: <20220417175441.13830-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220417175441.13830-1-straube.linux@gmail.com> References: <20220417175441.13830-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use sizeof() instead of hardcoding the firmware header size and add a compile time check to ensure struct rt_firmware_hdr has the correct size. Signed-off-by: Michael Straube Acked-by: Larry Finger --- v4: - no changes v3: - added the compile time size check from patch 8/8 of v2 v2: - no changes drivers/staging/r8188eu/core/rtw_fw.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index a80cc7fa3a53..42b36505cf8b 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -39,6 +39,8 @@ struct rt_firmware_hdr { __le32 rsvd5; }; =20 +static_assert(sizeof(struct rt_firmware_hdr) =3D=3D 32); + static void fw_download_enable(struct adapter *padapter, bool enable) { u8 tmp; @@ -268,9 +270,8 @@ int rtl8188e_firmware_download(struct adapter *padapter) DRIVER_PREFIX, fw_version, fw_subversion, fw_signature); =20 if (IS_FW_HEADER_EXIST(fwhdr)) { - /* Shift 32 bytes for FW header */ - fw_data =3D fw_data + 32; - fw_size =3D fw_size - 32; + fw_data =3D fw_data + sizeof(struct rt_firmware_hdr); + fw_size =3D fw_size - sizeof(struct rt_firmware_hdr); } =20 /* Suggested by Filen. If 8051 is running in RAM code, driver should inf= orm Fw to reset by itself, */ --=20 2.35.1 From nobody Mon May 11 02:55:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99B8EC433EF for ; Sun, 17 Apr 2022 17:55:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234713AbiDQR57 (ORCPT ); Sun, 17 Apr 2022 13:57:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234665AbiDQR5a (ORCPT ); Sun, 17 Apr 2022 13:57:30 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 940575FAF for ; Sun, 17 Apr 2022 10:54:53 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id t11so23482384eju.13 for ; Sun, 17 Apr 2022 10:54:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0hjkhnlwJyVMU2AUpWHdvtIxfINbruD73WC12kbTecg=; b=onnNgsfGHFMQxV97R5b5CO0cwjKjy0A3+ZYtLhVYhbEWbgJRw+NLdfmH82ZO42k8Q5 LZAzbTed4Ik3QmRe3eVUZ03nPBH2iuVx5fxhA5dxRGffZ+Fo+9RC8t8fdCx8Bs0P7RBk 5tXwSuZzod78rX1A4815G7+jgEr04KWI0LBc7VECrE0h/i8C+XUuYLyO59YHC/e39MHn sdskRDvwVvdyqJGSMCJ2RPa9p2DYKzn7yd5ijTzdQ+QcYHjWVtWT0HlHGBtQvfQxKg/x pRLj8tgZOvU7tVu88qBWV8wL7g7gRZ7Znz+RlBWCzxX0Mb8Fg04SyFw5M3gF+IxwPoNl wQLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0hjkhnlwJyVMU2AUpWHdvtIxfINbruD73WC12kbTecg=; b=7whiPmeTvr67gQi6swGECqZStys3v24etdAHGATiFAWfocoHEl6TRGFVg57xF3KBYi 9QlZINS7S0yl4bL4lTjGjx72oBByhvRoiv1a8GyDb073B/8OJoT+Bulc+PL6hPlVgsRH EN6pqe/QfCWkTaWSlCvD6+1yfkiddVn90/zerSIPF0tRa/Fy2B22o0f/mFYVkVrzmfI/ lhjr1Yjm9UTFX2TPtkWGXy0ON5BOJ1lXEITKr+pWToMpqg85Reg7+v0TcXuYvbnksr7l gP31iXr62juajpFh42Giazut74V6rA+4NH9NJbUeRo0DmrGWcL8XIhdHTn3cPU+iDuVf LPNQ== X-Gm-Message-State: AOAM532xLisBi2gx2SlY9QF4rGVUnxQIxyjJuoORuDghXp73IXRF90Kw nuXxsKKFfUmv4W4EUaMZ9+FZznW79FQ= X-Google-Smtp-Source: ABdhPJwRE4TM2Uv9ctJx+uZMtaGNyIBc2VTQiW7EV36qn4EQMF9318gtirSKRpsvEkNiXUdfw3k4lQ== X-Received: by 2002:a17:906:280b:b0:6ce:f3c7:688f with SMTP id r11-20020a170906280b00b006cef3c7688fmr6248610ejc.468.1650218092200; Sun, 17 Apr 2022 10:54:52 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id jw12-20020a17090776ac00b006e87137194esm3719409ejc.150.2022.04.17.10.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 10:54:51 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v4 6/8] staging: r8188eu: remove variables from rtl8188e_firmware_download() Date: Sun, 17 Apr 2022 19:54:39 +0200 Message-Id: <20220417175441.13830-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220417175441.13830-1-straube.linux@gmail.com> References: <20220417175441.13830-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The local variables fw_version, fw_subversion, fw_signature in rtl8188e_firmware_download() are only used in one place. Use the assigned values directly and remove the variables to make the code shorter and cleaner. Signed-off-by: Michael Straube Acked-by: Larry Finger --- v4: - no changes v3: - no changes v2: - no changes drivers/staging/r8188eu/core/rtw_fw.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 42b36505cf8b..7fa985cc787a 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -244,7 +244,6 @@ int rtl8188e_firmware_download(struct adapter *padapter) struct dvobj_priv *dvobj =3D adapter_to_dvobj(padapter); struct device *device =3D dvobj_to_dev(dvobj); struct rt_firmware_hdr *fwhdr =3D NULL; - u16 fw_version, fw_subversion, fw_signature; u8 *fw_data; u32 fw_size; static int log_version; @@ -261,13 +260,10 @@ int rtl8188e_firmware_download(struct adapter *padapt= er) /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr =3D (struct rt_firmware_hdr *)dvobj->firmware.data; =20 - fw_version =3D le16_to_cpu(fwhdr->version); - fw_subversion =3D fwhdr->subversion; - fw_signature =3D le16_to_cpu(fwhdr->signature); - if (!log_version++) pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", - DRIVER_PREFIX, fw_version, fw_subversion, fw_signature); + DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, + le16_to_cpu(fwhdr->signature)); =20 if (IS_FW_HEADER_EXIST(fwhdr)) { fw_data =3D fw_data + sizeof(struct rt_firmware_hdr); --=20 2.35.1 From nobody Mon May 11 02:55:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA62FC433EF for ; Sun, 17 Apr 2022 17:55:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234789AbiDQR6K (ORCPT ); Sun, 17 Apr 2022 13:58:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234667AbiDQR5b (ORCPT ); Sun, 17 Apr 2022 13:57:31 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67E62D71 for ; Sun, 17 Apr 2022 10:54:54 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id g18so23490512ejc.10 for ; Sun, 17 Apr 2022 10:54:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9MDV0/SfYE0g/BRQSyONptj6V2+VN8KUp8JOekp0ChY=; b=dNV9jqlDcvOWKoI9yIR6gNroK1LPp2f7YPSy7sxp6ufMs7u6+8ERSPWJ7o4SWo7Dca VJF5X9XZakL7ETn2B2fECY3tKAptRbzBPHTTNi+DNP5PU7rFLs1+VRJ7R4edgzQ9AAyc Qvbilq/0pXwTjv/AIAeyl/aPh5jJ8oY253uis81SCI+VmXqobrZEK39LxIRgYWAHCvNK qGtbdWi6A/GaOU+dGQcmS6VFLbFktbdJXdHLji0zNq1X+ruyGWj9Q0BdCFGm7oSEN3Sh /hrhbUNhTLZ8pVL6CyqqNCL/aWzF8uVjAtL3X4FIpudX/Vf0y59mFXswWIWd1VwSp888 D7GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9MDV0/SfYE0g/BRQSyONptj6V2+VN8KUp8JOekp0ChY=; b=2VihkWl1RstB/LmUQW8dd3elmyXrYXzEOsGbFQQZAjbKp1WrG9x9unYUMyvbQXm91o Pfqn6m7sSrDwXFyp5JbSUEq3xSv0XnYm9IWcmcrucar9+aked3/KAKn7o5xo+ZK2K/ib g3tLTlr/KjR+xKWs8vCNhNRRJtw5RSF2tuhIdcikxX8LNJZehbVWEo4zfyUFp5w+CybZ HVqvZ1+d5o2T4SoNPUvESvwO37216mIEyTXBJOxPQM8fOgUXnePbQKQ99sr+exAk9+Ud /PLC7WuZEWa6mRn6mmKUDKHmng45LfCfQiNJGDPkX8O6GjQUAQLLdMlKGS7I1j/vBp4h wEpg== X-Gm-Message-State: AOAM530wjxT6tQlo7QpiTmoMO1WYsvqAf1ng0UaaCIMKCOCTMUkTpseR zOjN345aeqscCH74fLjFkQs= X-Google-Smtp-Source: ABdhPJz9wj2GiUC4EiQUAWFDal6IptWIYB4nGu0JskCND41prKDeVnyt02JT+o235OQIcosEHNbnBA== X-Received: by 2002:a17:906:5006:b0:6ce:3762:c72e with SMTP id s6-20020a170906500600b006ce3762c72emr6396051ejj.30.1650218093041; Sun, 17 Apr 2022 10:54:53 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id jw12-20020a17090776ac00b006e87137194esm3719409ejc.150.2022.04.17.10.54.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 10:54:52 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v4 7/8] staging: r8188eu: use pr_info_once() to log the firmware version Date: Sun, 17 Apr 2022 19:54:40 +0200 Message-Id: <20220417175441.13830-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220417175441.13830-1-straube.linux@gmail.com> References: <20220417175441.13830-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use pr_info_once() instead of a static variable and an if statement to log the firmware version only once. Signed-off-by: Michael Straube Acked-by: Larry Finger --- v4: - no chages v3: - added back logging the firmware version only once, using pr_info_once() instead of a static variable and if statement v2: - no changes drivers/staging/r8188eu/core/rtw_fw.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 7fa985cc787a..7c0653bb3bbc 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -246,7 +246,6 @@ int rtl8188e_firmware_download(struct adapter *padapter) struct rt_firmware_hdr *fwhdr =3D NULL; u8 *fw_data; u32 fw_size; - static int log_version; =20 if (!dvobj->firmware.data) ret =3D load_firmware(&dvobj->firmware, device); @@ -260,10 +259,9 @@ int rtl8188e_firmware_download(struct adapter *padapte= r) /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr =3D (struct rt_firmware_hdr *)dvobj->firmware.data; =20 - if (!log_version++) - pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", - DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, - le16_to_cpu(fwhdr->signature)); + pr_info_once("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", + DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, + le16_to_cpu(fwhdr->signature)); =20 if (IS_FW_HEADER_EXIST(fwhdr)) { fw_data =3D fw_data + sizeof(struct rt_firmware_hdr); --=20 2.35.1 From nobody Mon May 11 02:55:03 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06865C433EF for ; Sun, 17 Apr 2022 17:55:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234155AbiDQR6G (ORCPT ); Sun, 17 Apr 2022 13:58:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234668AbiDQR5b (ORCPT ); Sun, 17 Apr 2022 13:57:31 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38B9D1115 for ; Sun, 17 Apr 2022 10:54:55 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id b24so15326599edu.10 for ; Sun, 17 Apr 2022 10:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7CAZCfRACh0L5o3iUpdS1aX8z+UWy3lXInDId0V/Oc4=; b=P6HUhtYl1uh3h+roOaxgoAowVSYFjUKLpP+tNwbfMmaT9O7ADedH873ebyC/gPrFIG RavjhCD3EO7rHHonqHjgXC+m/4rdPrBVHnFjjNx5pKTxLibdwLwHEYtiz7turkWP/iUk iTxZR4aC5QThAkLnlcjYA+PPM7wh7KI9VZj4uP+T4lFOndZ+Qt1erM21H/KlJSCiNFdn Ty4Ya1xVqmWRbhu+wHL4XZAPpCai2pq6RAiui2kBbaGUu7liQwSu9Frk8obyHCIjsH85 rHYPSbADLbBhc1Z3umj4ElOTuUk+6ovVwHLkZKcIEY4Opm82svhm7khoYfH5Ool5T3h4 An0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7CAZCfRACh0L5o3iUpdS1aX8z+UWy3lXInDId0V/Oc4=; b=aqDZVpo4/Gn1R0HkRlCzXHFRfuyuGSPRdQqHxe1g+gZMIACtwd4jOrph35UsfDKWCX ojdYQf19MYnyGVwB/6POalYbVfvvDboxB1uC9AvA1xB0I2asttW3dM/QBDXi8iG4sMBL Z2+1Jfy3pbW/WyDeuBsL3H4xTP2lpXj7zcTZEh7yB3BcQa7jB5pMdd3K2at2/+j1kNtV 6eepYkUaJVsi1RmmJf+Ba0ywXwpFRgHPld0G7CBQ4vhYYxP+He857szExdAQsHwIL6gG 6AACmCmsOCJ/CHpUL5P/ie+scg4gIl4O+xjDwtibzwOk0R/M6/yRsK6Gdqs4xzpeybJh nYiA== X-Gm-Message-State: AOAM531sGrlw3Uu27707h/yAhoVlwtkgr/Kc6zWd7sFOKNnpfBaoxszm Xv2JE4SWgm3lUf0ZvuncawaoUHyShHg= X-Google-Smtp-Source: ABdhPJx6nU4bE19M11BfvT5Na8Jb8dh8bqyxVsyfIfqyuMkAshwrYU63shKfcHtbPnlgtLi6asbS4Q== X-Received: by 2002:a05:6402:1b07:b0:41d:7abf:8337 with SMTP id by7-20020a0564021b0700b0041d7abf8337mr8559736edb.185.1650218093803; Sun, 17 Apr 2022 10:54:53 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id jw12-20020a17090776ac00b006e87137194esm3719409ejc.150.2022.04.17.10.54.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Apr 2022 10:54:53 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v4 8/8] staging: r8188eu: check firmware header existence before access Date: Sun, 17 Apr 2022 19:54:41 +0200 Message-Id: <20220417175441.13830-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220417175441.13830-1-straube.linux@gmail.com> References: <20220417175441.13830-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" We should access the fields of fwhdr only if the check for firmware header existence is true. Move the affected code into the if block that checks firmware header existence. Signed-off-by: Michael Straube Acked-by: Larry Finger --- v4: - no changes v3: - no real changes, just the pr_info() -> pr_info_once() from patch 7/8 is different v2: - no changes drivers/staging/r8188eu/core/rtw_fw.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 7c0653bb3bbc..bf077876ed3d 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -256,14 +256,13 @@ int rtl8188e_firmware_download(struct adapter *padapt= er) fw_data =3D dvobj->firmware.data; fw_size =3D dvobj->firmware.size; =20 - /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr =3D (struct rt_firmware_hdr *)dvobj->firmware.data; =20 - pr_info_once("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", - DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, - le16_to_cpu(fwhdr->signature)); - if (IS_FW_HEADER_EXIST(fwhdr)) { + pr_info_once("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", + DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, + le16_to_cpu(fwhdr->signature)); + fw_data =3D fw_data + sizeof(struct rt_firmware_hdr); fw_size =3D fw_size - sizeof(struct rt_firmware_hdr); } --=20 2.35.1