From nobody Mon May 11 04:10:00 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 B3DF7C433EF for ; Fri, 15 Apr 2022 12:10:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353132AbiDOMNK (ORCPT ); Fri, 15 Apr 2022 08:13:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345844AbiDOMNF (ORCPT ); Fri, 15 Apr 2022 08:13:05 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2091EBF011 for ; Fri, 15 Apr 2022 05:10:37 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id c64so9703503edf.11 for ; Fri, 15 Apr 2022 05:10:37 -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=Z4IE0OQ8E/8/Uo6VyqqsqfAO6v80qcrW7+EGio8VhGM=; b=WC9meVzZPRT6pezD6Ws9XoFwNenm93wY/iI1l3ZOcr9RTV6lZTgdhNi2Gna3ZskEy8 ywCE+2tm0GpcJDsoKgWlsbgkBn0tmHSLwIn1t82MDnzax0EbMT0qcgQ+hqyYE5VKwlgA 9uQWzA+l4HAxF+lw/amOk18f23c+SuCVoj32mwPNU9VPzF0ONsn6AnNXxKcsymQJtm6S VY3QdJMaCTUlcd2n4TgbApmcxmzU+0uVEEjyDDx39Q3hgxcVtwCLH7BvyREXQACOtaaf 4RoD0J8q7VrZyBXiHjg/DRQhc9u+xkNMlPL1zAbrSysLLLDNOJDyxwj/AJrZZFG9zMIx Z6xA== 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=Z4IE0OQ8E/8/Uo6VyqqsqfAO6v80qcrW7+EGio8VhGM=; b=NLSc0o61b/JhwUUqdNzw9fOApzmNLge5JQIgQl3gf8hQb1W60n7kRweX2XwJoTpvwK kV4tBi3/zDS9sQfBIM8yfYRsnAzC4un25zXdqs4hyYlEAmU2S8DtO+6naGCG2HDdGY5P CGEKfkMcg2LkxVgHWYUWU0E/8uzZtWP/hrI8OG83f1MCU+oA3DdKowkCFXROYVg9LAiz 208DH9ra6AjLQVt+olm3ceM90PP7/BAU6OnIdXI/WmXUI1xy+Ar1ONofBjPhOy0uYCUM 64vnzxAukg83iFQ59TsmzKR6PwEh2yXxccoDNoXYlwzBzBXjkglXDeDqHX4YGLG0Ep7G xDXg== X-Gm-Message-State: AOAM530ELb4hLTRjNaiO3xP9wH73EBzqhqwUn1kgsXSDhmDASXJnKM0P /XMnI/mM+9ZZr25uxlonoUI= X-Google-Smtp-Source: ABdhPJzc/Ktw3QuQHevJBYmv7RNJVnQ4aXRFxN6BVeK4nFygvduqD5EIjkFsqLCqH/CKMr6QjrLQ2Q== X-Received: by 2002:a05:6402:350d:b0:41d:675f:ea96 with SMTP id b13-20020a056402350d00b0041d675fea96mr8048459edd.297.1650024635706; Fri, 15 Apr 2022 05:10:35 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id z22-20020a1709063ad600b006e8867caa5dsm1626114ejd.72.2022.04.15.05.10.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 05:10:35 -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 v3 1/8] staging: r8188eu: fix struct rt_firmware_hdr Date: Fri, 15 Apr 2022 14:10:16 +0200 Message-Id: <20220415121023.11564-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220415121023.11564-1-straube.linux@gmail.com> References: <20220415121023.11564-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 ----------------------------------------------------------- 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 --- 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 04:10:00 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 95C24C433FE for ; Fri, 15 Apr 2022 12:10:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345020AbiDOMNO (ORCPT ); Fri, 15 Apr 2022 08:13:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353114AbiDOMNG (ORCPT ); Fri, 15 Apr 2022 08:13:06 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0EDDBF025 for ; Fri, 15 Apr 2022 05:10:37 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id g20so9709333edw.6 for ; Fri, 15 Apr 2022 05:10:37 -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=BF4TCbU6C9xeKRNJJ36SItYcPCun9OHmo5cQ4fb+y9k=; b=qjo3DLwg9IXADd5tJrJKtAAdwCMePL5P9soz7DcU1LjaRpFAPwzuc5TpKRkNV21G0F 0o5SDEmEoL5TTyybVcnMNdCDaYU1wOamNsgmVDeQe2xJ25CLRmscVqizRHa2quGkAqjz Mhww8Vr9mbW1R9d9404wXEfaOw+jbDf6ucYc8RCLrkCC4LKo/hcD8Z6IEc0ho3uKOjLN xshmY9dTw9We1NCex4sSDpSHb6+2Op0ECQhCg3FbT5OtZl5B5PQHAa5Bm0UA0nkJnHim 0Dora0lvDuHJ6PXx0LfS8S452/MinMHBx/5ykoclCiM4UB99S5Kpzl/q6R3gIqJEC4xU N59w== 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=BF4TCbU6C9xeKRNJJ36SItYcPCun9OHmo5cQ4fb+y9k=; b=bhB4C2iD0uCMHiVKoIXoLfQrQui6MjbYfREnbsyDJqqmHGMGUeM06pzkh1Mk6WTaAN S0sXu3UOxodVvsRbLhQd4hxCir5LBmzOQndyaacjLJFgEvfU+5Uqofk81k3VZmeRgN4G 7HNjrfbLlDbpUDn09PFJedw0P5rPsU+uC4AHU9noYztv44PnClhpNbZaErzzGjXht6K6 Nb+1jFSpQ9o1nucpt/Nd/sAct+5NhU/aU0QLAR1OF2u9MqasgXNcVrX6gp1EocnfOZ/9 4B9n59C1mo3Y0mk0ThC1BsoyZbDsTuct4uTxb8FjbZaW+Sxjfy+G8VIszq5sp7da4RRd NQaA== X-Gm-Message-State: AOAM531Js+5EXp/9jmFgB/ljAd7lnSJAaoa9rC7O2WSUM5SReae7bpeK ZS7oXyY/tLhy0xe7zt2eo24= X-Google-Smtp-Source: ABdhPJyTK4fb4HivgjaWIOeg0Bxb+kDmDFFgJKXoXKFGvf1eYxH9vLx3g9pz8JRMRMFoQZbdtgPUnQ== X-Received: by 2002:a05:6402:26c7:b0:41b:7aef:bdf6 with SMTP id x7-20020a05640226c700b0041b7aefbdf6mr8074085edd.210.1650024636413; Fri, 15 Apr 2022 05:10:36 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id z22-20020a1709063ad600b006e8867caa5dsm1626114ejd.72.2022.04.15.05.10.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 05:10:36 -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 v3 2/8] staging: r8188eu: convert u32 fields of rt_firmware_hdr to __le32 Date: Fri, 15 Apr 2022 14:10:17 +0200 Message-Id: <20220415121023.11564-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220415121023.11564-1-straube.linux@gmail.com> References: <20220415121023.11564-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 --- 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 04:10:00 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 E89F2C433EF for ; Fri, 15 Apr 2022 12:10:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353158AbiDOMNV (ORCPT ); Fri, 15 Apr 2022 08:13:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353122AbiDOMNH (ORCPT ); Fri, 15 Apr 2022 08:13:07 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 903AEBF011 for ; Fri, 15 Apr 2022 05:10:38 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id s25so9261278edi.13 for ; Fri, 15 Apr 2022 05:10:38 -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=ao+2u5mN9oqQNh9Bj75ET9jSsQPun5Z4kpcJNLscrms=; b=cjoLOsSDj/9/qFpS2S1vuZWjEowzAEn4dR0Nh2GziZQLnl4Bn3FUrhJZjp7IfB7AS/ 6LdzKS8R4qeoBYxCkRdZjzxr4mTOY9oJcDZqA2QPH/v1BtuPL5kKlG8vOHAPwf5lKNs/ vRfPfrVB/l7zNqMlmGmjcpMPUxSwzhsXSQqxV6OWrV2whRiGaW/al8nqo23kWqBswDO3 Pv6lDtq8Nhcva64wzC+TwdnAf4HF2HWLSS0BwZAk0vO9NpNAhduMf96SpnsZkVdX9iCe AvGQq9OnuQC6jY0+XyGgLisJfmIvCdO8aPLreEP0Y9HC3YZ310e730d4NMy9xuSX5gvg t4vQ== 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=ao+2u5mN9oqQNh9Bj75ET9jSsQPun5Z4kpcJNLscrms=; b=fKxfp21lmMfP9N24Q0V21sq0PEjQ4mY65+RWZh3jpIBeUGAUi++xWKACz2qC6kJmr8 BGRet7rOrJXFRwNWglKT4RpQW835s/G3EXk08zXJEovVqIwdb+xYTHRVOOOYKsk5BCA8 cU8SKbEz4iPXhzZ6EfXV4Gb+5T5PhDoHRoFMxLobuITZKL0V+gSCdHTxaMWhYUooi/NY Z/6C7xV27OU7dI9L/J4wPoLEOH+kxIZKJVSdd0o7UzGRN2tQkmws09uWfTTFywId3lDJ xW1yoNMBKBxCoWrMDcMOZN7lFuIajjvgwCFa47xJ6n5117OWuU7LdJH/5lAm76WolLkB Yt+A== X-Gm-Message-State: AOAM531PGKzO64i5S8QbJUSjsN7uJs6qzKpCiUUerjS5prZldtXR5DtF 2djvJCJf+If88R8CKIo+l2Q= X-Google-Smtp-Source: ABdhPJyKs7kZ6vzgwX3OHrdJ0E5c3YGCeKrhSaUtvDjb6Bz6b6BkhJdPWey9xTtiDxWqKRMwmZGI5w== X-Received: by 2002:a50:cc9e:0:b0:41d:7123:d3ba with SMTP id q30-20020a50cc9e000000b0041d7123d3bamr8022989edi.296.1650024637162; Fri, 15 Apr 2022 05:10:37 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id z22-20020a1709063ad600b006e8867caa5dsm1626114ejd.72.2022.04.15.05.10.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 05:10:36 -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 v3 3/8] staging: r8188eu: clean up comments in struct rt_firmware_hdr Date: Fri, 15 Apr 2022 14:10:18 +0200 Message-Id: <20220415121023.11564-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220415121023.11564-1-straube.linux@gmail.com> References: <20220415121023.11564-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 comments in struct rt_firmware_hdr are not needed. Remove them. Signed-off-by: Michael Straube --- v3: - no changes v2: - no changes drivers/staging/r8188eu/core/rtw_fw.c | 37 ++++++++------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 7cd08268f3b9..323e0c634c4e 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -14,37 +14,22 @@ (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 */ + __le16 Signature; + u8 Category; + u8 Function; + __le16 Version; + u8 Subversion; 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; + u8 Date; + u8 Hour; + u8 Minute; + __le16 RamCodeSize; u8 Foundry; u8 Rsvd2; - - /* LONG WORD 2 ---- */ - __le32 SvnIdx; /* The SVN entry index */ + __le32 SvnIdx; __le32 Rsvd3; - - /* LONG WORD 3 ---- */ __le32 Rsvd4; __le32 Rsvd5; }; --=20 2.35.1 From nobody Mon May 11 04:10:00 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 BCBADC433EF for ; Fri, 15 Apr 2022 12:10:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353168AbiDOMNZ (ORCPT ); Fri, 15 Apr 2022 08:13:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244633AbiDOMNH (ORCPT ); Fri, 15 Apr 2022 08:13:07 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EDD9BF02E for ; Fri, 15 Apr 2022 05:10:39 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id ks6so15110257ejb.1 for ; Fri, 15 Apr 2022 05:10:39 -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=CJi+tLxXamIuDAtEfjvcqCgFDEYBl2Om677cUuE/bbA=; b=qhgCzLkd+bA8r6SGZR0qHhG5JQ7asfZzybk24U9sGCt3ey4X5LXDDQ4i/mlbDP4rfC HQyjoXVEHNgVlog7GS3/ZkEoWAT9MA2/dKy01Qu0TZK3xs+AeeDm7D5b4ulNomEFab1L ufKiKzSbgF75EGlXqf8oL+gIQq9tZJW//fGWY7ODb/W+5DXMjUTAMU5CnnlKW2aGrK+y wOzEY7hkcGV0XqH8zG6Y4bnxJgudVvv3IA9QnlSMxkMrKVOx46qV081CN3aKrIHbzdY3 wTI5shBrGrPiyYr47zLdXtEcaozQTXAN8e7yoAuepiyN8gtoVl/RchVaGyFEhr8VtH4S VLYA== 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=CJi+tLxXamIuDAtEfjvcqCgFDEYBl2Om677cUuE/bbA=; b=LuCZkX9Hnm6bAgnmLt4gM2jWxsyfc2p/Vz0BZuRz8CgrgcibsPYeWuQPCWOgGnSMOp aYovedCg5IXOJCgyppUgSG0Zrj6cwd7mkMOZh3jItMMFNAoDymmL85c3EUZ88gc34LN7 gNHsxYLsyNcDkrSF78CDRnvigb5TpSkA39v/ABPIjjV9jh/6KgbYJoRc8WuNe/GbFUUs FOqqjk7A7rwogjSODlGFzaFR79vbLpjjOj6+iJaBrXr12A54cdCu5U9i549+xehJRKF4 DTl54wAQr0kkzScW1+JaxqCYJxPnIyt375QpRD9Az5njazi9LlsS+HNzi5DkPPuXEHDr lNdw== X-Gm-Message-State: AOAM530NN38Nc9NE0JY3UK/r5nAbDmgH4rUtmmS9i7k7fYi6wdVyNWju O+hKUvLDina2aIk0BCW0bnY= X-Google-Smtp-Source: ABdhPJx5rDcal83LHDyWtmxL13N9eb58SYGqi/MCghxYdcwXxrcc4lbxqNt0s5f9P18SdzlnJLh7DQ== X-Received: by 2002:a17:906:4fcb:b0:6e8:74db:6b04 with SMTP id i11-20020a1709064fcb00b006e874db6b04mr6064220ejw.676.1650024637867; Fri, 15 Apr 2022 05:10:37 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id z22-20020a1709063ad600b006e8867caa5dsm1626114ejd.72.2022.04.15.05.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 05:10:37 -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 v3 4/8] staging: r8188eu: rename fields of struct rt_firmware_hdr Date: Fri, 15 Apr 2022 14:10:19 +0200 Message-Id: <20220415121023.11564-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220415121023.11564-1-straube.linux@gmail.com> References: <20220415121023.11564-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 --- v3: - no changes v2: - no changes drivers/staging/r8188eu/core/rtw_fw.c | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 323e0c634c4e..3da52a1ba23c 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -9,29 +9,29 @@ #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; - u8 Category; - u8 Function; - __le16 Version; - u8 Subversion; - u8 Rsvd1; - u8 Month; - u8 Date; - u8 Hour; - u8 Minute; - __le16 RamCodeSize; - u8 Foundry; - u8 Rsvd2; - __le32 SvnIdx; - __le32 Rsvd3; - __le32 Rsvd4; - __le32 Rsvd5; + __le16 signature; + u8 category; + u8 function; + __le16 version; + u8 subversion; + u8 rsvd1; + u8 month; + u8 date; + u8 hour; + u8 minute; + __le16 ramcodesize; + u8 foundry; + u8 rsvd2; + __le32 svnidx; + __le32 rsvd3; + __le32 rsvd4; + __le32 rsvd5; }; =20 static void fw_download_enable(struct adapter *padapter, bool enable) @@ -254,9 +254,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 04:10:00 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 16721C433EF for ; Fri, 15 Apr 2022 12:11:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353169AbiDOMN3 (ORCPT ); Fri, 15 Apr 2022 08:13:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353126AbiDOMNI (ORCPT ); Fri, 15 Apr 2022 08:13:08 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E2F9BF021 for ; Fri, 15 Apr 2022 05:10:40 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id u18so9737874eda.3 for ; Fri, 15 Apr 2022 05:10:39 -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=AIzdnXqq8wGLmGwxNERvkoiK7wlULE8JtNhbbdlQcXU=; b=AhZkde2UDiS6UAXvRn0HZ6uJDRpn0vfl8QQd12Hfwe7oU9pGBHHce640fZjHAMRORy 9KOrxP0tjpZTzpw+0d3JlaFy/jI/1GSXxztGSGUFivq3dlP0oS60vxeI5TaKRL8TrOmY 4j3+fKRNWTFy+0h/44cxsg/FbQ8QoKkTSsVoLyBiDZBAvF3BOqsMyQ4t9Dtr5Ohpuxd1 Sm3wrar3z/aOrBSz3QV3BQczvUVQTh8jfi6M2hPbT8vUZ0ix3e0/YUlcZjMpWTJz7QYK xUAlEGpjc946/wF9mxly3nSoDh1qSPTukAMHJU8lsdZrbEWcEYsN4drC6BB0I7R7DXBl Glzw== 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=AIzdnXqq8wGLmGwxNERvkoiK7wlULE8JtNhbbdlQcXU=; b=Tz/bA87vYbpQH9IbLiJEt8bATkekpee3qN8eyeGIYCm3pDkGuD887Cl7PooVT6H7Uc TDtFe+K02602PTeQTz1/6iAV7XxJ3FswAGdj2yH28al0jUXa41G1GRFTNeOTTAEMjPEh d4Dh17EZIoEt1/uJNrV2YsXQe9+s4r5Krde7qYlWhtktGSmtxJ9O+Ctcl2UuITzP6eMS xUKI90YTBOmr3l2HIWgAVkIrPDhkgTp8B5ZG14xRO9uZnzkK2UDcuWZR+4P48YhEJDih RXflN79X0sJhBzuSCCoLxJKHkr2i9oysg6aXbTNIIcuBgAs92QLlNg+tCdOH30gbhBa3 qPnA== X-Gm-Message-State: AOAM530U5gKrxTkKgq/xliyauP7LbHk9vCEbv9QrzUHDbonQMboFXd4+ Pzm0x/w+878/sHZDGq5l1X0= X-Google-Smtp-Source: ABdhPJxBzgAc60hojY9aRNWWERHCOl6M0oNxLqNlqslWmJlPsWaCWeT+juQcpPcQkopMEWbEz0enDw== X-Received: by 2002:a05:6402:ea8:b0:41d:78ca:b929 with SMTP id h40-20020a0564020ea800b0041d78cab929mr7906887eda.289.1650024638617; Fri, 15 Apr 2022 05:10:38 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id z22-20020a1709063ad600b006e8867caa5dsm1626114ejd.72.2022.04.15.05.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 05:10:38 -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 v3 5/8] staging: r8188eu: use sizeof instead of hardcoded firmware header size Date: Fri, 15 Apr 2022 14:10:20 +0200 Message-Id: <20220415121023.11564-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220415121023.11564-1-straube.linux@gmail.com> References: <20220415121023.11564-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 --- 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 3da52a1ba23c..0279af37719a 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -34,6 +34,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; @@ -263,9 +265,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 04:10:00 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 B34BAC433EF for ; Fri, 15 Apr 2022 12:11:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353187AbiDOMNh (ORCPT ); Fri, 15 Apr 2022 08:13:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353128AbiDOMNI (ORCPT ); Fri, 15 Apr 2022 08:13:08 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE28ABF500 for ; Fri, 15 Apr 2022 05:10:40 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id s25so9261383edi.13 for ; Fri, 15 Apr 2022 05:10:40 -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=oTYVhYWSzKwAMLeflfz6kIIWiCkCWj7eP186JTpFtoA=; b=PJOu5zElcuDrXbf8hOAmTWjYyGseIHiqbrS+V1b1DpzwvELip1pxqjJ2BBTGc5b6gk ZS98OfOE7wopGOwS+nJtU4kKPv7DswCCoCjXjJjn2/ao9p+uELfGyxwv/GcMPdYbMb4T gfuivYBzfkasFoKkrjOH+UIUjQWKmJeFOWMgA4EIapT8qip+x+W2MM4/uuDVXIKkARCe JWCh+eRl/dl7Kt8ilUx+dLt90BpuqjugRDom87xVrLhV4irL71lH3ijBCFTII8Hb54NL W0cO0H4OLprKcBsMwpJQwAIqUNzIqqF1eNNN5cYSAsRknY9OgppSRQZqqVfNO7L3Lc+4 HzYA== 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=oTYVhYWSzKwAMLeflfz6kIIWiCkCWj7eP186JTpFtoA=; b=w5Yuy4TOSXT74FkrvJT6eQageVOVpon8WabXfzkMxmNQTSkQYYE49+VWWDuwZYUXmo FuqRBm1XxyRMR4XHB0U0g/0uRP+15gwunJe6PVW5c6HLFeYyCeyCwnje5HY52hnyQvAn JODdWEh7EaBG79KR0yhCykcs8jDTjrwOL0+b8iB+8vG11abaIrQkBjwMrs8DH92VfSv1 +Dq4HNM8Wcyn7HqS0mpUIDRxQItG7kdXZQZSYbWcaruvP/bj3MLaECRftShefuLuPM91 1GkquJsN+WB+VJ31BfIg1qBOsCtnaILwukfxh1aNf1z+4zCBzC3MSpgjjnu07VrzNFc7 rsZQ== X-Gm-Message-State: AOAM531dI3mUNVVnwuKMudrNEr1Uwg9zLhOXiYuJFOCRnWdriTRtRaOf WfmSwwQj58xXG+nVVahi3iI= X-Google-Smtp-Source: ABdhPJyBxROMVGQaY33pMHG3ZmIew8vBTdfu5ydjPsIMpCCQdAArrdXf5H9QMfZFDzqXHIYOOU+vmg== X-Received: by 2002:a50:fc89:0:b0:41d:83d1:9df3 with SMTP id f9-20020a50fc89000000b0041d83d19df3mr7811095edq.19.1650024639443; Fri, 15 Apr 2022 05:10:39 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id z22-20020a1709063ad600b006e8867caa5dsm1626114ejd.72.2022.04.15.05.10.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 05:10:39 -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 v3 6/8] staging: r8188eu: remove variables from rtl8188e_firmware_download() Date: Fri, 15 Apr 2022 14:10:21 +0200 Message-Id: <20220415121023.11564-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220415121023.11564-1-straube.linux@gmail.com> References: <20220415121023.11564-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 --- 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 0279af37719a..c102aba099f5 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -239,7 +239,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; @@ -256,13 +255,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 04:10:00 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 9E936C433EF for ; Fri, 15 Apr 2022 12:11:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353178AbiDOMNe (ORCPT ); Fri, 15 Apr 2022 08:13:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353131AbiDOMNJ (ORCPT ); Fri, 15 Apr 2022 08:13:09 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3E76BF030 for ; Fri, 15 Apr 2022 05:10:41 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id c64so9703705edf.11 for ; Fri, 15 Apr 2022 05:10:41 -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=8KAY162R6REHgBPdBqhvvmTxa6PH0xoKVGSpUfSsZF4=; b=KfccGz9UIICu5SzHhnvSz+16pHm5dm8jmnihk9YkYRAv9ABjKX5Gazz1WfqSSk9v5O A1ctedVvVu6udB3vCVaj13TreytRJlIxbXtwtEGPbbB/RHTB2jTXOe23E/7b1fVB8CuV ix1pAqivV7GdXnruLgK9CECcCuYF4IlOl+K7/mB/vdCM/kSyx/X7lgKNX1JkvUvNlrt8 Bb1kndCNaRchWyTffvipqMwtMHidL9h4HIZM3NWgnpBPJg/QXuQzcxTrKfNeuF3itN6R cgqWvzYo+f7VFzzWctzokrnDTrsB73RVDLRWA2FAQvobepzmpfbRNIUIaTe05tLCztEk 4Yeg== 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=8KAY162R6REHgBPdBqhvvmTxa6PH0xoKVGSpUfSsZF4=; b=1HC8zJd3MAQb7/ZlGAdfERVS9fbj+TOHWFqqTFLgRXDL04FHF9TCn14DL5r2GYZBVw shjxNqEGkIRLmotTwiUWHSo+MV8PMeGGYYsokroB35AL4IALqX8yETzfI4amz3JOcvAj jyD2tvX6D1MdkpWqjyFOEqCLImEJaj97AE+5s0oBb6rWueaqhKO6TcGql/e5HIIQOJ95 d0yGdcjOfMWQSP58ZkHLnTdVR+xB6EqDXVc01AELdQRC8ozumhtdEaBDCqqpP2n7f0Qr 7sVaKmuj0uYsxYs4tsjHPzKywsbjT47pjWO6E8LfCtMgKYcAPOCW9579STlFPpcl9Err iQbg== X-Gm-Message-State: AOAM531MgwtGt52NvpNNwPnORbL03GuLCWAx9HruZ/7vZuzezydsO+5y j2c8rjQsrpkSepJyUzQ48x4= X-Google-Smtp-Source: ABdhPJzp+eY7lyQyNnnPvE7g/Fr3nWkXH8WYAEr0BptQnA6xyL/897xBASEi3KHTUZ3eiHKZQ19xag== X-Received: by 2002:a50:a408:0:b0:41c:cdc7:88bd with SMTP id u8-20020a50a408000000b0041ccdc788bdmr8064984edb.399.1650024640201; Fri, 15 Apr 2022 05:10:40 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id z22-20020a1709063ad600b006e8867caa5dsm1626114ejd.72.2022.04.15.05.10.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 05:10:39 -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 v3 7/8] staging: r8188eu: use pr_info_once() to log the firmware version Date: Fri, 15 Apr 2022 14:10:22 +0200 Message-Id: <20220415121023.11564-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220415121023.11564-1-straube.linux@gmail.com> References: <20220415121023.11564-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 --- 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 c102aba099f5..7ee72236c7f4 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -241,7 +241,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); @@ -255,10 +254,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 04:10:00 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 6CD04C433EF for ; Fri, 15 Apr 2022 12:11:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353194AbiDOMNm (ORCPT ); Fri, 15 Apr 2022 08:13:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353123AbiDOMNK (ORCPT ); Fri, 15 Apr 2022 08:13:10 -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 7970EBF011 for ; Fri, 15 Apr 2022 05:10:42 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id t25so9711453edt.9 for ; Fri, 15 Apr 2022 05:10:42 -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=+YYK4vy259MFhr5syvwnMVIGmoB/m/01LjYdYR6zHbo=; b=OFGsGWd+TJQk2Rg81s7SRN7EQf0lKglfkAW4B079wNdWeyzha85aIFue/NHsviVZ+J 6ay05JBd8VcwZ2hLEnL5YtYVvZccBRASgFbEZge7ce2xrjvrVw0uvGxuFwJgFOlos6g+ OZM+kvcCfM/ISazrD7xhUKazsRqdc9wHlAyqP+Dw2bJEtcs/IDH8CPHfPIgRTFb3J88s 50z3eg2H4ErTHA9B5wTDCLIDLYQ1tEMe8UyBY5Z2hTsLUDoU5+4JNBCy+1c7fEuTWnHE r2MFv5aVzs30mI/SHsxRAJmdvdMXfclngTRfvqqVkOtI71e2USJP9RH9U3+5FtRPO4zE WvhQ== 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=+YYK4vy259MFhr5syvwnMVIGmoB/m/01LjYdYR6zHbo=; b=XIRHTfw+B/nQQpCX/aXB6IFmbBtRbptw269+M+eg9y/AwhAfbVI/m5S4TP4RPICELA wloPkdq1giDeAUXuGSVf4Smt2/xxATtGK9xB0VfwIVVRhWvv16GmK9OApH0jLzTyZMXf IcE4wAT0KJ3gktYRlXbDmlolNgj05JjL32p+qB6p+CeBQk3R71FFCu/1bTtKlaR5IbWO UL0b5wYLH/kiOBJQLmTC/DKRSZGBuQqU9+eOh5saU9GxstmK2N/AvM74O2cnWoOSWtL+ wz1zu8PkXVEbz24HfFFvC/3T4jNfdiHaO/RZbzg9MY56Nj07tPzUaprEnnn/Ynt56Fhb +IIw== X-Gm-Message-State: AOAM5336T3aYlvTgyq+hSm8E17voRrGbhHvMNaqcRTj9Advy047ECKmd EVb0kPPrXtk4UBuV9oYjS5E= X-Google-Smtp-Source: ABdhPJxcOj8Ad1mmGtO9rNI7z9DkpThgUe4k1yRqCC+CsGPDvAZVCojKnwhqdkIjc7ALYNI+f3oXNg== X-Received: by 2002:a05:6402:35d6:b0:41f:95b8:a945 with SMTP id z22-20020a05640235d600b0041f95b8a945mr7974772edc.40.1650024641079; Fri, 15 Apr 2022 05:10:41 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id z22-20020a1709063ad600b006e8867caa5dsm1626114ejd.72.2022.04.15.05.10.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 05:10:40 -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 v3 8/8] staging: r8188eu: check firmware header existence before access Date: Fri, 15 Apr 2022 14:10:23 +0200 Message-Id: <20220415121023.11564-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220415121023.11564-1-straube.linux@gmail.com> References: <20220415121023.11564-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 --- 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 7ee72236c7f4..8b5c67780a7b 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -251,14 +251,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