From patchwork Mon Nov 16 23:37:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 324533 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3728296ils; Mon, 16 Nov 2020 15:40:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJz4Nu2dAXU2pI75QxUIM3QraNWPCLHT1JlruHAzD+3s8CS0nm9qlPww7RlIElzgxR/uBKxe X-Received: by 2002:a17:906:a891:: with SMTP id ha17mr16884776ejb.116.1605570044567; Mon, 16 Nov 2020 15:40:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605570044; cv=none; d=google.com; s=arc-20160816; b=fo3NsH3t7806oYcqvOm2miS8W+Rkgrh9NrGhi72EM8m8Q0tD9XJ/QmKMjZznCxZ7Ry yZXq1zI3GbbkkbpiKN/APhfbbuvKywWedslLhPJXAcLkawRX23LGQle8ZFo+U8rOZst3 6BRFp/JqwUulbYussCgC3cchutCy3qXhBmdMVQQMruQVM+Zn40qcWJVPzfa9uGyDifwN ccCQYU1rB/yX77wfmwBxoWl+kAftajAInPhCzl20JjyORgAa2xywaXM7U0X/C3tKn/SH XqI70gEKM9ibM9qYXFDk3dgmIbxjQKMRtdxcIgounrvfF4ctn9kFzFMtp5sgPTw5j76p K80w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=miGXLixORMdi7i2E2KGi5NSoYisIYv8Xp9fzXt5c7vw=; b=Okx65iwMfFyW38TPIWrKLJqE5T7ChG1Nj9I/chyHrTO9sRlvBfi6lSpUOZj0brSKc1 u9Lu+Um2JBfLEctR5piipkWpfiOBQKa+cTeYdEoDx9aVI+2/Bn7yqB4cgkeX7FfgTs6S 8rihI0IKxAV5ekVrC6ROnrsAh/7tHOHSZIpd2dUzuXuTC52oU447WY3pkkkVCkBLQAXF XiXnM5DOjZb5hnMecYR/QxoaWs+l4XoBCiUvBrv2TlkF8N4BifSXijAw8jUFguyOVIKx TAQJg5v+pCalj22gpRkRIVSM0U2Xdins5DktZ+fpTx7WHSHu/6whRB06YQyun1mtqb01 Pw8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hviPeDal; 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 cc8si14104639edb.163.2020.11.16.15.40.44; Mon, 16 Nov 2020 15:40:44 -0800 (PST) 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=hviPeDal; 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 S1731297AbgKPXiz (ORCPT + 8 others); Mon, 16 Nov 2020 18:38:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45868 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730941AbgKPXiU (ORCPT ); Mon, 16 Nov 2020 18:38:20 -0500 Received: from mail-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25902C0613D2 for ; Mon, 16 Nov 2020 15:38:20 -0800 (PST) Received: by mail-io1-xd42.google.com with SMTP id j12so19311852iow.0 for ; Mon, 16 Nov 2020 15:38:20 -0800 (PST) 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=miGXLixORMdi7i2E2KGi5NSoYisIYv8Xp9fzXt5c7vw=; b=hviPeDalWc15oQvXLtAt/Q7e8K2nSWO5V9xZAl8H2DBXItZjZGUMLPQy3Oy1wE6XVf /AFZ/nyrkPK4/qjim1E64ZjZeQnv+u5FRPeoYK+qwhxe6O3CX2Lcb+TWF1RgnyjooVKv o7hz/CU6ecT1bNRWyGtJdBH9ld0mwwiE8l36kZMqqmvJUnLS/rOz1tCALxM6ySW646FA LRtoPU9kpf+AdcnB5AiI0IjsRJW/k1sCnEHBwcsLbV2YIR2WtYw36H3hwtUCVN3TL6sn aEtjq73dzg+JBwfjQgrWa/kgfGcb7Ez/Uo8V5DJv2XkR2XlK4v3tZbtDa5FR2d0LLq3V tIqg== 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=miGXLixORMdi7i2E2KGi5NSoYisIYv8Xp9fzXt5c7vw=; b=COtE0bN49IfoP7aEcU39gU9ADIuKrAacevWczrahZ/A46F8TQ71XylROcYrdwJ16Fp PDfU7inQjYt2ImzAFE4rKM3/WhpmYMBwm+uLNCysm2UndSepAzB6slaaok+X/AdMAS1n 85GYntoLuKQmd5tvwad+qS5HiTH0bY68/BlwP1t5+UmNj5srFBYrhjmKxTaoLw/xBgMP ZG4vpUDBejePqVChHvtVTJf+iok50fSzo1GZKc1VcENpgOfD6Vq0q4B75OS7CFHh/wyb wJB6DJLiJjx9aw9k/atU3eiVRm5F9yMn/r5f4yqfZcT1XgZUDXfo9kNjtab8zuLEoYaI H2Qw== X-Gm-Message-State: AOAM533+WDFoMuBugb5Fxh/vNgDqR3hjsQLR4kCNhHcb9m/sJB6/oFNf 5M2wjDui6I6s9uBw7Q5sFSe1mkcrfGR1OA== X-Received: by 2002:a05:6638:b30:: with SMTP id c16mr1539600jab.61.1605569899560; Mon, 16 Nov 2020 15:38:19 -0800 (PST) Received: from beast.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id f18sm10180099ill.22.2020.11.16.15.38.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 15:38:19 -0800 (PST) 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 04/11] net: ipa: fix two inconsistent IPA register names Date: Mon, 16 Nov 2020 17:37:58 -0600 Message-Id: <20201116233805.13775-5-elder@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116233805.13775-1-elder@linaro.org> References: <20201116233805.13775-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Rename two suspend IRQ registers so they follow the IPA_REG_IRQ_xxx naming convention used elsewhere. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_interrupt.c | 6 +++--- drivers/net/ipa/ipa_reg.h | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) -- 2.20.1 diff --git a/drivers/net/ipa/ipa_interrupt.c b/drivers/net/ipa/ipa_interrupt.c index cc1ea28f7bc2e..61dd7605bcb66 100644 --- a/drivers/net/ipa/ipa_interrupt.c +++ b/drivers/net/ipa/ipa_interrupt.c @@ -139,12 +139,12 @@ static void ipa_interrupt_suspend_control(struct ipa_interrupt *interrupt, u32 val; /* assert(mask & ipa->available); */ - val = ioread32(ipa->reg_virt + IPA_REG_SUSPEND_IRQ_EN_OFFSET); + val = ioread32(ipa->reg_virt + IPA_REG_IRQ_SUSPEND_EN_OFFSET); if (enable) val |= mask; else val &= ~mask; - iowrite32(val, ipa->reg_virt + IPA_REG_SUSPEND_IRQ_EN_OFFSET); + iowrite32(val, ipa->reg_virt + IPA_REG_IRQ_SUSPEND_EN_OFFSET); } /* Enable TX_SUSPEND for an endpoint */ @@ -168,7 +168,7 @@ void ipa_interrupt_suspend_clear_all(struct ipa_interrupt *interrupt) u32 val; val = ioread32(ipa->reg_virt + IPA_REG_IRQ_SUSPEND_INFO_OFFSET); - iowrite32(val, ipa->reg_virt + IPA_REG_SUSPEND_IRQ_CLR_OFFSET); + iowrite32(val, ipa->reg_virt + IPA_REG_IRQ_SUSPEND_CLR_OFFSET); } /* Simulate arrival of an IPA TX_SUSPEND interrupt */ diff --git a/drivers/net/ipa/ipa_reg.h b/drivers/net/ipa/ipa_reg.h index b46e60744f57f..e24c190665139 100644 --- a/drivers/net/ipa/ipa_reg.h +++ b/drivers/net/ipa/ipa_reg.h @@ -454,17 +454,17 @@ static inline u32 rsrc_grp_encoded(enum ipa_version version, u32 rsrc_grp) (0x00003030 + 0x1000 * (ee)) /* ipa->available defines the valid bits in the SUSPEND_INFO register */ -#define IPA_REG_SUSPEND_IRQ_EN_OFFSET \ - IPA_REG_SUSPEND_IRQ_EN_EE_N_OFFSET(GSI_EE_AP) -#define IPA_REG_SUSPEND_IRQ_EN_EE_N_OFFSET(ee) \ +#define IPA_REG_IRQ_SUSPEND_EN_OFFSET \ + IPA_REG_IRQ_SUSPEND_EN_EE_N_OFFSET(GSI_EE_AP) +#define IPA_REG_IRQ_SUSPEND_EN_EE_N_OFFSET(ee) \ (0x00003034 + 0x1000 * (ee)) -/* ipa->available defines the valid bits in the SUSPEND_IRQ_EN register */ +/* ipa->available defines the valid bits in the IRQ_SUSPEND_EN register */ -#define IPA_REG_SUSPEND_IRQ_CLR_OFFSET \ - IPA_REG_SUSPEND_IRQ_CLR_EE_N_OFFSET(GSI_EE_AP) -#define IPA_REG_SUSPEND_IRQ_CLR_EE_N_OFFSET(ee) \ +#define IPA_REG_IRQ_SUSPEND_CLR_OFFSET \ + IPA_REG_IRQ_SUSPEND_CLR_EE_N_OFFSET(GSI_EE_AP) +#define IPA_REG_IRQ_SUSPEND_CLR_EE_N_OFFSET(ee) \ (0x00003038 + 0x1000 * (ee)) -/* ipa->available defines the valid bits in the SUSPEND_IRQ_CLR register */ +/* ipa->available defines the valid bits in the IRQ_SUSPEND_CLR register */ /** enum ipa_cs_offload_en - checksum offload field in ENDP_INIT_CFG_N */ enum ipa_cs_offload_en {