From patchwork Mon Oct 29 21:16:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 10660215 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-2.web.codeaurora.org (Postfix) with ESMTP id 7564A13B5 for ; Mon, 29 Oct 2018 21:17:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 68E7328EC7 for ; Mon, 29 Oct 2018 21:17:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D24C28FC3; Mon, 29 Oct 2018 21:17:03 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 B110F29A2E for ; Mon, 29 Oct 2018 21:17:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726683AbeJ3GHZ (ORCPT ); Tue, 30 Oct 2018 02:07:25 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:50810 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726485AbeJ3GHZ (ORCPT ); Tue, 30 Oct 2018 02:07:25 -0400 Received: by mail-wm1-f67.google.com with SMTP id h2-v6so5913242wmb.0 for ; Mon, 29 Oct 2018 14:16:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FrEx31FEN1Xt85vWZOCOuIBvafEBBqd+ASNr4UAzXkk=; b=HIQFIIECGMcm0Skq2KUnQMGmuXsLbrhZmOEUtAgIkqH5nGPOvSWvS7FuCBh3hnypMB SMboO6oube+JiOz75eNz1r3eqetex1bsBD/deNvhJWWoZUQNSOmBjVTaE8ESu5KEFC2h NpWkW5qe6sq66FzaTYz7qKEQ+Hsx0O1NsaCkNtx3Y60oJPAJAgzA49n15LxlTiO0rsYJ 7C9F98t1mCUoviD+7av2M+5c8Od70+u5FdCuLFBdqKtq5fL5NW5j5Vqsu8u/GuiDa16u AUnch6FuuTG5oeJB1/2L3tkwfGrA5+O+exkm1vZogzOgnyyePgOPDdgD2NvJmqdwzt7J ERZw== X-Gm-Message-State: AGRZ1gJGuS2uVRCvIyLAFqAxCwDEmnLJg0c38dCPNexgOQRdmPRrpqGR umBpWdMKDVr5BNBxzGRnzsCTWF9nMTE= X-Google-Smtp-Source: AJdET5dKvyqdSOCLMnPD2XnHQWxdTEbAbb7YtzIe4028hc/VyRdugMZJ290UICzV+AC5tV0KrMUqlg== X-Received: by 2002:a1c:8414:: with SMTP id g20-v6mr14887096wmd.123.1540847817586; Mon, 29 Oct 2018 14:16:57 -0700 (PDT) Received: from localhost.localdomain ([151.66.3.112]) by smtp.gmail.com with ESMTPSA id 138-v6sm7829306wmr.16.2018.10.29.14.16.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 14:16:56 -0700 (PDT) From: Lorenzo Bianconi To: nbd@nbd.name Cc: sgruszka@redhat.com, linux-wireless@vger.kernel.org Subject: [PATCH] mt76x2u: init: use common routines for wcid/key initialization Date: Mon, 29 Oct 2018 22:16:50 +0100 Message-Id: X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 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 Use mt76x02_mac_wcid_setup and mt76x02_mac_shared_key_setup for shared keys and wcid table initialization and remove duplicated code Signed-off-by: Lorenzo Bianconi --- .../wireless/mediatek/mt76/mt76x2/usb_init.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c index c338ac0433ad..94a4b58fddc1 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c @@ -166,11 +166,7 @@ static void mt76x2u_init_beacon_offsets(struct mt76x02_dev *dev) int mt76x2u_init_hardware(struct mt76x02_dev *dev) { - const struct mt76_wcid_addr addr = { - .macaddr = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, - .ba_mask = 0, - }; - int i, err; + int i, k, err; mt76x2_reset_wlan(dev, true); mt76x2u_power_on(dev); @@ -210,15 +206,14 @@ int mt76x2u_init_hardware(struct mt76x02_dev *dev) return -ETIMEDOUT; /* reset wcid table */ - for (i = 0; i < 254; i++) - mt76_wr_copy(dev, MT_WCID_ADDR(i), &addr, - sizeof(struct mt76_wcid_addr)); + for (i = 0; i < 256; i++) + mt76x02_mac_wcid_setup(dev, i, 0, NULL); /* reset shared key table and pairwise key table */ - for (i = 0; i < 4; i++) - mt76_wr(dev, MT_SKEY_MODE_BASE_0 + 4 * i, 0); - for (i = 0; i < 256; i++) - mt76_wr(dev, MT_WCID_ATTR(i), 1); + for (i = 0; i < 16; i++) { + for (k = 0; k < 4; k++) + mt76x02_mac_shared_key_setup(dev, i, k, NULL); + } mt76_clear(dev, MT_BEACON_TIME_CFG, MT_BEACON_TIME_CFG_TIMER_EN |