From patchwork Fri Jan 20 21:27:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9529511 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5390E60113 for ; Fri, 20 Jan 2017 21:30:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6285428698 for ; Fri, 20 Jan 2017 21:30:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57420286D9; Fri, 20 Jan 2017 21:30:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID, URIBL_BLACK autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BABC628698 for ; Fri, 20 Jan 2017 21:30:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752327AbdATV3C (ORCPT ); Fri, 20 Jan 2017 16:29:02 -0500 Received: from mail-oi0-f65.google.com ([209.85.218.65]:36302 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217AbdATV1X (ORCPT ); Fri, 20 Jan 2017 16:27:23 -0500 Received: by mail-oi0-f65.google.com with SMTP id u143so6456710oif.3 for ; Fri, 20 Jan 2017 13:27:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=T9uWmh+hr/nQ1Pr70+s+mlW+rP0OuF9JySW85vZSyK4=; b=dOgmadb+upnZQHp5+xqp1rTvFEQ3fwM5LrE9Y7D2y1465XeAZGxBzzOZaSqkDKqMsM CfWBYuQIEdqXQraBgrxYXmB9ZAIaihBQO1YxVexHYbBFMer2+cmsfX7c9eKdFfwcFh5G HzEOhYGejwEdQlyTQQS4dLk4zvUF87cJQZHj1reYEn0VrQsNLDgUs5Q9QS97ciGOBdEb 0XbwjsyVfygmrPHTnNVHgonRPZbRzAXd8ud5cfUiodWAGXLy7x4ahHtKrfclBB9ym0bz 2bZjoBXPHViUBdojnezlgJD+sfaZzpReNN/CUWhJVuNWgRqkyQMMpvmlOzycipwLsVzp SyDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=T9uWmh+hr/nQ1Pr70+s+mlW+rP0OuF9JySW85vZSyK4=; b=qgrib/nVhH+0sHx5k2D0epOFHpZwHf0mkPw0zhOTDoZ25IR+WRyXLY6WJO9+JN/pkB THYgjcfymMZkGRUFVfuszi5se5Re3RPoqAlRdNoPPaLdgAABp37PAzyUXScM33r5mRny WqtlwT4y5asYNm9apcLFLFXU5/DJqSbX0b5CTW2uUTt9o9O+itl1XbcF5YC5yJeitu9W QLRS6CeMo/KDogz5eLUUJ1s7keXhZc01kMb+WUsvQ6lO05ph2awv+s+8FbHvRFFJ/ZEc zY/zJ4Afx9DU3wv4/B+kGRt+vqpm/DHwD20xWDXfGlvOjaDKQnVDnryeR1a8VWdTpNvS jqfQ== X-Gm-Message-State: AIkVDXI0iOG1qOuXu6Yisbmot8DNoHI11QvqGlnA/Ykq1Y6uYZ9TdeDZOB2qKQz6Ae2Ryw== X-Received: by 10.202.231.204 with SMTP id e195mr8370381oih.141.1484947642853; Fri, 20 Jan 2017 13:27:22 -0800 (PST) Received: from linux-4v1g.suse (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id r94sm4320403ota.33.2017.01.20.13.27.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Jan 2017 13:27:22 -0800 (PST) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Ping-Ke Shih , shaofu , Larry Finger Subject: [PATCH 01/11] rtlwifi: Fix programing CAM content sequence. Date: Fri, 20 Jan 2017 15:27:06 -0600 Message-Id: <20170120212716.29887-2-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170120212716.29887-1-Larry.Finger@lwfinger.net> References: <20170120212716.29887-1-Larry.Finger@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ping-Ke Shih There is a potential race condition when the control byte of a CAM entry is written first. Write in reverse order to correct the condition. Signed-off-by: Ping-Ke Shih Signed-off-by: shaofu Signed-off-by: Larry Finger --- drivers/net/wireless/realtek/rtlwifi/cam.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/cam.c b/drivers/net/wireless/realtek/rtlwifi/cam.c index a0605d8..f7a7dcb 100644 --- a/drivers/net/wireless/realtek/rtlwifi/cam.c +++ b/drivers/net/wireless/realtek/rtlwifi/cam.c @@ -45,12 +45,13 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no, u32 target_command; u32 target_content = 0; - u8 entry_i; + int entry_i; RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_DMESG, "Key content :", key_cont_128, 16); - for (entry_i = 0; entry_i < CAM_CONTENT_COUNT; entry_i++) { + /* 0-1 config + mac, 2-5 fill 128key,6-7 are reserved */ + for (entry_i = CAM_CONTENT_COUNT - 1; entry_i >= 0; entry_i--) { target_command = entry_i + CAM_CONTENT_COUNT * entry_no; target_command = target_command | BIT(31) | BIT(16); @@ -102,7 +103,6 @@ static void rtl_cam_program_entry(struct ieee80211_hw *hw, u32 entry_no, target_content); rtl_write_dword(rtlpriv, rtlpriv->cfg->maps[RWCAM], target_command); - udelay(100); RT_TRACE(rtlpriv, COMP_SEC, DBG_LOUD, "WRITE A4: %x\n", target_content);