From patchwork Mon Jun 29 21:49:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 192028 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3253570ilg; Mon, 29 Jun 2020 14:50:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfgK1ieHetPIDxJATYnKJpwuU4p1/fBIpH/XDcUAkpZW5k/2Jxc7cYMEu7v/2Z4ZPCEcaI X-Received: by 2002:a50:b086:: with SMTP id j6mr16986178edd.6.1593467420346; Mon, 29 Jun 2020 14:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593467420; cv=none; d=google.com; s=arc-20160816; b=eNA7iXUh8TGoGHZ9qslZIf1WwV2PZFMZPsv+elJSRSZEGSUluzH9Ta8P+2Qt6RZm1M XI7M6bPCxGqzLhkqcQT94MROeAYJBtIMx2GAGMB2izGUhxpaR9Iu9aGa126gJuapMErp 9gwRwfKh288+9LKgNBwiR5Cz6GsCFvqiWzDp5NqQ+jcotC2JqmWUvzSnID+w1zv+FigO wmJ2nbHcDganZZu6M75iAquuDpqvr+TO+TH6x9YuXVRONlajaskx4al04XLjU1HgVduf kD99fQt5ae0va+G2LRiRhPFGudQ+BMjyOAqFXb1VxQ285SzsJzKTlC/BRO1qYqsS+764 AO/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Il6tZPozA+81DRifdvTR8dOWxcR0CVn20QskeLQXSZw=; b=fQwovBfGdrAgf7kbVaMvr5d9nlFsn1nfibgn6DZ7pff7s24QbqwpOAM0jycBBeWmbH Wa+NCqEOnxXn+nSCoM/vV5csA3lq3bcTkVTVo6q9McUBl0daVqnoANXtO7RVqZ1RetQc 5SN57OgrdWwm1+/75xV0+3/cCwBP3nePfPmQ78eHCdphRYWTxIjI/qo7U6gvF/I5SiyB /0dfHcPAw6ZAoA/ji4XmypIMOK3a13DIEafO+iv35UiADKZU/J01DrIKr2nOEwPocpYL mIOlEVsGbJhM9dORASNZs5/lE3p/pAUVG2EtQeXLZzfdIOvBKSxGeWrKWRUqP1RrsID7 tMrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lqVFoan+; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i24si458627eds.397.2020.06.29.14.50.20; Mon, 29 Jun 2020 14:50:20 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lqVFoan+; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404378AbgF2Vt4 (ORCPT + 9 others); Mon, 29 Jun 2020 17:49:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404375AbgF2Vt0 (ORCPT ); Mon, 29 Jun 2020 17:49:26 -0400 Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE756C08C5DC for ; Mon, 29 Jun 2020 14:49:25 -0700 (PDT) Received: by mail-io1-xd44.google.com with SMTP id y2so18867268ioy.3 for ; Mon, 29 Jun 2020 14:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Il6tZPozA+81DRifdvTR8dOWxcR0CVn20QskeLQXSZw=; b=lqVFoan+9JSGnYlS5t8a7bwkLr0z10ICIXqMz1hxYO2oexKA364ZUNfCWNwL08JpmV /+lTaRryvPqLqMDfxaUqYfWDiWmkBmfw0qumv6sX9x0klUHBMOWHwQEfPE0DrOzkOdkb 7wixiAuLQCtC/YN23hPtrj4jLV5oAsLVbPBXJ8TBA8EV9hHV91KOPCr5cw0/45VidQES 4qdyKi2LtpZIUPhVU3tfScB08DgQkCQWt9MiY2NZBC3QSvT02SLVg0K9QsaR/BKImE6l SQBJIAvz/PD665euNXFPJlogsqAJ7Rj57mGmlamjHDL7pyuN6NT+2Pxl7fUBlRPom8JU 6K1w== 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=Il6tZPozA+81DRifdvTR8dOWxcR0CVn20QskeLQXSZw=; b=AoPZMgnUjX0uMZ2H+f4KlkhmIIeBLamwNxIktlSGIcwrppbnUOOv0F/CfeZbxn/3+f expQwCez+87rAbr1VvmV4YWwtN8a4JZyguWQQRuvZzjmAC0vjQF0kAj7UmagvXLSbsrU EjctvJavdENOz+h7gmA/Bb17Y3ObhA4hGtKnDZJpHeZ8TOHguveDHAe5efDCw5gI/DyL bl3AZfwM8LVv5YZMvMJIQBESuvDxqFHksayqhW7exLgvJrNWF8yGnxY/3Y/YMqIF+6sj j/Q3L4PfbCY7fmTtr0j93I1TuEZbW5odgvSxgSsgeRKW1VZyw63yx8yE8p/QG6PU38bK fCLA== X-Gm-Message-State: AOAM5338GEwRZH828lUjQRvwCSM8yfbaF1h5/4G4LLxIsRJWW+TcaFfn EVaN04d7vpz2rrEY6ypzige8og== X-Received: by 2002:a02:10c1:: with SMTP id 184mr19313863jay.135.1593467365137; Mon, 29 Jun 2020 14:49:25 -0700 (PDT) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id u10sm555500iow.38.2020.06.29.14.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 14:49:24 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: evgreen@chromium.org, subashab@codeaurora.org, cpratapa@codeaurora.org, bjorn.andersson@linaro.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/5] net: ipa: metadata_mask register is RX only Date: Mon, 29 Jun 2020 16:49:16 -0500 Message-Id: <20200629214919.1196017-3-elder@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629214919.1196017-1-elder@linaro.org> References: <20200629214919.1196017-1-elder@linaro.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The INIT_HDR_METADATA_MASK endpoint configuration register is only valid for RX endpoints. Rather than writing a zero to that register for TX endpoints, avoid writing the register at all. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_endpoint.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c index 3f5a41fc1997..0c2bec166066 100644 --- a/drivers/net/ipa/ipa_endpoint.c +++ b/drivers/net/ipa/ipa_endpoint.c @@ -527,10 +527,12 @@ static void ipa_endpoint_init_hdr_metadata_mask(struct ipa_endpoint *endpoint) u32 val = 0; u32 offset; + /* assert(!endpoint->toward_ipa); */ + offset = IPA_REG_ENDP_INIT_HDR_METADATA_MASK_N_OFFSET(endpoint_id); /* Note that HDR_ENDIANNESS indicates big endian header fields */ - if (!endpoint->toward_ipa && endpoint->data->qmap) + if (endpoint->data->qmap) val = cpu_to_be32(IPA_ENDPOINT_QMAP_METADATA_MASK); iowrite32(val, endpoint->ipa->reg_virt + offset); @@ -1306,10 +1308,10 @@ static void ipa_endpoint_program(struct ipa_endpoint *endpoint) (void)ipa_endpoint_program_suspend(endpoint, false); ipa_endpoint_init_hdr_ext(endpoint); ipa_endpoint_init_aggr(endpoint); + ipa_endpoint_init_hdr_metadata_mask(endpoint); } ipa_endpoint_init_cfg(endpoint); ipa_endpoint_init_hdr(endpoint); - ipa_endpoint_init_hdr_metadata_mask(endpoint); ipa_endpoint_init_mode(endpoint); ipa_endpoint_status(endpoint); }