From patchwork Sat Feb 11 18:32:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Kaiser X-Patchwork-Id: 55860 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1614578wrn; Sat, 11 Feb 2023 10:52:27 -0800 (PST) X-Google-Smtp-Source: AK7set8KZ+AGp4pU0zLHQTWLFtgFu4rfSapGAoI9WJ9us944L/l+PiS8+DoVJwK6gJ8n9Wie52Vh X-Received: by 2002:a50:d515:0:b0:4ac:be83:2044 with SMTP id u21-20020a50d515000000b004acbe832044mr326559edi.3.1676141547479; Sat, 11 Feb 2023 10:52:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676141547; cv=none; d=google.com; s=arc-20160816; b=klxlmGmBO6ivVqq6ry5BtZAdAu0yiV2xVoK88O/baLGwuPd9U5HgDqtHxk6BDXvpo0 IaCrZM+VMH81hqFDdUtYxjRPj9jMgZuL5pRUTRJT0B8vU7h1PU/FPZ/JYVaF68riEcMS uKgIbYM1fj43kpAllwSlrRIWEyhUy1XRBbYQiLww4N5B4diRHP7+ITztZeSXJoT/sIHE FxBO960ovSFoe3rPQ5/B5xIzWV4lJY9vGOciRtacYYxl5GNd3qCcq15QRw6Qc522/hMP 5/XChKAZOvvv74gWpBRlibdaZQhb/qg0ZVggvsm7FiiRcSI3tu96nKTnjT/o8hyvK8Li ckrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=45WOnvijp8XJPDnv97jZlubxlVwqndX/WTMYNpU721I=; b=DU+UWjSxH8XDrqPjCFu+/v8ECtJzkV9swQ7fsPX18FYd3SLvCaUEp8vt2NlT40c9vg w2Sxzb/VM7S+BnaipSYMgZowZmy+Pafxxz7LAMIdeznSF4bltXXYeLuGioRguMtkjYRe iSOhccvZGWVqHCfuybnvIdwmbSu+brWirmb6KjW6GpMKmC6dFzMk310ZFKbqpmE33aa9 hl2eexwyqRD1G5CzIsCJ9xwu+rvfn5MC0aAxi0/k8yC1KJjaXDN5Br8ltgfTCmFNO/kr ISWEgGfjysHAKvW5k09R7tpdCSg36e5KoInIjxUkrsXM/SnMLIA+VNgl1dSYEKlq4unM Rrpw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h26-20020a50ed9a000000b004acb5d7b9edsi2777597edr.152.2023.02.11.10.52.04; Sat, 11 Feb 2023 10:52:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229553AbjBKScy (ORCPT + 99 others); Sat, 11 Feb 2023 13:32:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229457AbjBKScx (ORCPT ); Sat, 11 Feb 2023 13:32:53 -0500 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18897FF27 for ; Sat, 11 Feb 2023 10:32:48 -0800 (PST) Received: from dslb-094-219-036-079.094.219.pools.vodafone-ip.de ([94.219.36.79] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1pQufw-0007VD-S4; Sat, 11 Feb 2023 19:32:40 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH] Revert "staging: r8188eu: simplify rtw_get_ff_hwaddr" Date: Sat, 11 Feb 2023 19:32:05 +0100 Message-Id: <20230211183205.426820-1-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757561799102084146?= X-GMAIL-MSGID: =?utf-8?q?1757561799102084146?= This reverts commit fd48124e09825797bdc8ff0120f2401030c618ee. The cleanup in this commit removes the qsel to addr mappings in rtw_get_ff_hwaddr. The underlying assumption is that rtw_write_port uses its addr parameter only for the high_queue check. This is obviously incorrect as rtw_write_port calls ffaddr2pipehdl(pdvobj, addr); where addr is mapped to a usb bulk endpoint. Unfortunately, testing did not show any problems. The Edimax V2 on which I tested has two bulk out endpoints. I guess that with the incorrect patch, addr could only be 0 (no high queue) or 6 (high queue), both of which were mapped to the first bulk out endpoint. Data transfers did still work... Signed-off-by: Martin Kaiser --- Hello Greg, sorry for introducing a regression in commit fd48124e0982 ("staging: r8188eu: simplify rtw_get_ff_hwaddr"). Could you take this revert before the 6.3 pull request? Thanks, Martin drivers/staging/r8188eu/core/rtw_xmit.c | 32 +++++++++++++++++++++- drivers/staging/r8188eu/include/rtw_xmit.h | 7 +++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c index d0761ac2e695..df88b3e29e77 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -1568,9 +1568,39 @@ static int rtw_br_client_tx(struct adapter *padapter, struct sk_buff **pskb) u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe) { + u32 addr; struct pkt_attrib *pattrib = &pxmitframe->attrib; - return pattrib->qsel == 0x11 ? HIGH_QUEUE_INX : 0; + switch (pattrib->qsel) { + case 0: + case 3: + addr = BE_QUEUE_INX; + break; + case 1: + case 2: + addr = BK_QUEUE_INX; + break; + case 4: + case 5: + addr = VI_QUEUE_INX; + break; + case 6: + case 7: + addr = VO_QUEUE_INX; + break; + case 0x10: + addr = BCN_QUEUE_INX; + break; + case 0x11:/* BC/MC in PS (HIQ) */ + addr = HIGH_QUEUE_INX; + break; + case 0x12: + default: + addr = MGT_QUEUE_INX; + break; + } + + return addr; } /* diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r8188eu/include/rtw_xmit.h index e4e5af198eee..feeac85aedb0 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -26,7 +26,14 @@ #define XMIT_BE_QUEUE (2) #define XMIT_BK_QUEUE (3) +#define VO_QUEUE_INX 0 +#define VI_QUEUE_INX 1 +#define BE_QUEUE_INX 2 +#define BK_QUEUE_INX 3 +#define BCN_QUEUE_INX 4 +#define MGT_QUEUE_INX 5 #define HIGH_QUEUE_INX 6 +#define TXCMD_QUEUE_INX 7 #define HW_QUEUE_ENTRY 8