From nobody Fri Feb 13 17:30:46 2026 Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D27341836EE for ; Thu, 18 Apr 2024 20:47:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473259; cv=none; b=PnooW8W/taS8JKiDpEVnlxwK+sUXnx0vlwZRQxdh40LPXeHtrlrdidXXwIY5v++jML4rGHGFgZgIrBm/Xrq5WkxEXRyquzkuz/RhnF3DxUCyIjUjDGlvypDD8RWfDzLf022QJZBIyKl7c7nu4cPMvWVJL5wuZ0tjhvXrgzF+D24= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473259; c=relaxed/simple; bh=wOZ29LhTx7wkAYOpITTHRSLIJcO3BmrsfUA3gU19uiE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tvqIDAJGIPgdBRi1GwUJrnBqi2uxHtaDnnYynwPmWGa0xv3mA9bS+xuFor3PgXGPLX7l7nLfJ4kDnQruUs6st9V2z84IiRjKQgMRlVhM/MfkOck4VgohI5JvmAZAGpcCiXQjXGD5/uojoxo6Ot/3OYSvS3R/VG75L+hhprIX7QU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=sp7hzYh/; arc=none smtp.client-ip=209.85.166.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="sp7hzYh/" Received: by mail-io1-f49.google.com with SMTP id ca18e2360f4ac-7d5e93b40feso53612539f.2 for ; Thu, 18 Apr 2024 13:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713473257; x=1714078057; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6LzULljTo8+N+96QvC2qoioFAtmWDPdfpszoy4xuRkk=; b=sp7hzYh/vnpXl0kDurNytDvVYou5VVMG/nV/QX69u5/jedeyFyQTl8g9KWp/YGhLv5 I2F6KhK6BxRs9k9TWVzV/o5k4VPyx/5iAcpWkcacotk61zD3qWTApwbiqbeKNXAMPKRt Ib55CzRsWP70QU7miXjUcPcGm1J9rgqlvvfc+pPaJf7AECop/HBng2uaZ1ceEoUmSSTn 507zP0vzyPxWKlKAiTD9Tee5mhLdk6omuCKpGgwdBCjKod5TTDnw3mB+YZJiKn0rCIQq pmZAUSUM/1ghcCcY0flR8uJH6sDMhoXEjbBFwrUiWoBQ3Sr86CZ248PjQeLxMmeyHk05 SCLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713473257; x=1714078057; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6LzULljTo8+N+96QvC2qoioFAtmWDPdfpszoy4xuRkk=; b=Jk3nM34VOuPfgw7WuRSQWlP9Nc7JsZCmm8rLE8wyivDClPB6kVYr1vGswnVr7H/1br 1xYB+zuvQ0yIMRGM44isroqp8NMKkyYgIS7IJTZv94iahJLkac8fE7kuTZFYicmR0Rio 8W3WqylDLQYIuIKBBU3qBchtYu83YMEsttPCMnq0o4nBAKwlOsUBphtWwV3sBMto1+OW +CSGssD3WcPdLn03GXejvnZaSyFyJiXkxjVedkbsnRiR73o1Wluzu6SYaTGRlqlxCxqZ q+Zutk5PHiAmDAvehJExiTm421vq8jEyxVtD/GYc2uYlbVoWXyJ06z3DsjDPRspnTLAA rhEg== X-Forwarded-Encrypted: i=1; AJvYcCULgWGn5szekfOlTXTdBiem2g1RUFgp0QW80Z3aVBPtt2F4yEr9NIQ9yrCLuq1mRqqZzGg/c50oRfihRzVtTDzW/JtCwgk9wJaawT2z X-Gm-Message-State: AOJu0YzWPW0hdzIH4xemr3+0Lvqb6wy6tj3hYByKu7Q1uPRgqCnyb7jm 0oxHZTXFDpSK73VLZw0H82gahrLPpfvEgn1xmDbIAitRvo2dgI5lfDc2Tgeo39M= X-Google-Smtp-Source: AGHT+IF/8sENsUBtrRO5r7kTRYkTSjppW5lU/+XdQth1kzRoara79a8dQ3dQQLUx9E2VuyuprtPmOw== X-Received: by 2002:a5d:9a9a:0:b0:7d6:5fb2:56bf with SMTP id c26-20020a5d9a9a000000b007d65fb256bfmr399803iom.11.1713473256983; Thu, 18 Apr 2024 13:47:36 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id r6-20020a056638300600b00484948cb8f5sm626998jak.91.2024.04.18.13.47.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 13:47:36 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: mka@chromium.org, andersson@kernel.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/8] net: ipa: maintain bitmap of suspend-enabled endpoints Date: Thu, 18 Apr 2024 15:47:22 -0500 Message-Id: <20240418204729.1952353-2-elder@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240418204729.1952353-1-elder@linaro.org> References: <20240418204729.1952353-1-elder@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Keep track of which endpoints have the SUSPEND IPA interrupt enabled in a variable-length bitmap. This will be used in the next patch to allow the SUSPEND interrupt type to be disabled except when needed. Signed-off-by: Alex Elder Reviewed-by: Bryan O'Donoghue --- drivers/net/ipa/ipa_interrupt.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/net/ipa/ipa_interrupt.c b/drivers/net/ipa/ipa_interrup= t.c index c44ec05f71e6f..0e8d4e43275ea 100644 --- a/drivers/net/ipa/ipa_interrupt.c +++ b/drivers/net/ipa/ipa_interrupt.c @@ -37,11 +37,13 @@ * @ipa: IPA pointer * @irq: Linux IRQ number used for IPA interrupts * @enabled: Mask indicating which interrupts are enabled + * @suspend_enabled: Bitmap of endpoints with the SUSPEND interrupt enabled */ struct ipa_interrupt { struct ipa *ipa; u32 irq; u32 enabled; + unsigned long *suspend_enabled; }; =20 /* Clear the suspend interrupt for all endpoints that signaled it */ @@ -211,6 +213,7 @@ static void ipa_interrupt_suspend_control(struct ipa_in= terrupt *interrupt, val |=3D mask; else val &=3D ~mask; + __change_bit(endpoint_id, interrupt->suspend_enabled); =20 iowrite32(val, ipa->reg_virt + offset); } @@ -246,7 +249,16 @@ int ipa_interrupt_config(struct ipa *ipa) =20 interrupt->ipa =3D ipa; =20 - /* Disable all IPA interrupt types */ + /* Initially all IPA interrupt types are disabled */ + interrupt->enabled =3D 0; + interrupt->suspend_enabled =3D bitmap_zalloc(ipa->endpoint_count, + GFP_KERNEL); + if (!interrupt->suspend_enabled) { + ret =3D -ENOMEM; + goto err_kfree; + } + + /* Disable IPA interrupt types */ reg =3D ipa_reg(ipa, IPA_IRQ_EN); iowrite32(0, ipa->reg_virt + reg_offset(reg)); =20 @@ -254,7 +266,7 @@ int ipa_interrupt_config(struct ipa *ipa) "ipa", interrupt); if (ret) { dev_err(dev, "error %d requesting \"ipa\" IRQ\n", ret); - goto err_kfree; + goto err_free_bitmap; } =20 ret =3D dev_pm_set_wake_irq(dev, irq); @@ -270,6 +282,8 @@ int ipa_interrupt_config(struct ipa *ipa) =20 err_free_irq: free_irq(interrupt->irq, interrupt); +err_free_bitmap: + bitmap_free(interrupt->suspend_enabled); err_kfree: kfree(interrupt); =20 @@ -286,6 +300,7 @@ void ipa_interrupt_deconfig(struct ipa *ipa) =20 dev_pm_clear_wake_irq(dev); free_irq(interrupt->irq, interrupt); + bitmap_free(interrupt->suspend_enabled); } =20 /* Initialize the IPA interrupt structure */ --=20 2.40.1 From nobody Fri Feb 13 17:30:46 2026 Received: from mail-io1-f54.google.com (mail-io1-f54.google.com [209.85.166.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 28DE819069F for ; Thu, 18 Apr 2024 20:47:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473261; cv=none; b=BdO4MdzL8TInqD0jGkAv/Hna2OlXzrzNMFJRpA2kEt5FxoZ80YASmRD2gV9lbL1UBwPASYkHnjm9cPy2qpNylJHzCPm6+vtxaBGHyX7mjvJYl0CnLEeqEnIgsiNQuG3DEXafObKv/I6pX28q9nKrb6GunH41IOjgL7YVA3V2RVk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473261; c=relaxed/simple; bh=SvZGld3nMQ7dE2gk0jttFi3f7Z56qPw6gijv/jWfvuw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sfxOh9kxUAI17HxQoPJcrb1jz7N5NtZRaM3QKTQLcdQX13Xpc7fm8UPCKTCAmija/rAIVqWMLFF83a9AK5tFBzRn1CVeycaTlJ559S986nzEn85qsnFI39RkmrFOEK3mwlU6d6bnNWBgi2H1JS1YU165Vc/nLpOIkKvP7GRGymg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=G0RM36eV; arc=none smtp.client-ip=209.85.166.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="G0RM36eV" Received: by mail-io1-f54.google.com with SMTP id ca18e2360f4ac-7da4373f850so16451239f.3 for ; Thu, 18 Apr 2024 13:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713473258; x=1714078058; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=03uMyBMor63/6Po8Y4dDq22jgMVPIQliIIsTiCDwZ1I=; b=G0RM36eVMkq+RjztfcJrrLXdtJTC4PaLmDraFFWHHHi/4HPlMgtIo5twMGvrScXlNc kFptF0IzjrlRiZj1G4OAYZ5vIZiZE0JfgqEAsywmg4ybKYlZxPu1NVyX+5spN60MBcV+ cHZ7rd0w3sdaVzJouFjHvVcw/974z/WP9gHnc6mRLXMgTrgbjSeWiVaxYS6DWLg1boQ8 VIRrU03UyKNQZDXaacyLYJZEnQDcOvOAZ7hUY0D7CgFvY3Snd5LlwdRWai5aCgZU7GD+ mrAm358TQafIC9SehdJ/C0ADS3eaxBWmk9mKjXYCMOlS7NvTe7KqA7srYOumD7qOSCpu FUsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713473258; x=1714078058; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=03uMyBMor63/6Po8Y4dDq22jgMVPIQliIIsTiCDwZ1I=; b=h9EHYI3N43DWBB4kDyhZYpCXYoFU6EgGGgc8+isa7pLwKj8G5yzbORIK21jWHdlBYw 1Jx94I5hTfcaucg+Cf/wfQggrfqpn5v0lo70Ea8MxglUx37EDJu8tKcbKEdqMWgxu5wi 7TujS30H+Uyl/VDKkqy+uHUKMJ5fvTMsh5M68axrEUOdFOv7o4rPN50yHCILvtInqeap ihUcbjUvURvoBMWla36iPgWEaXq1Gjzcv1X5KF95dyjtnNLyZHvVrUfaxNuUORRjGOzm hVBupW1npGodvj8pAnPf7FjbhW/bYt3PGASkY3t1b3TWfEn6/RMAG7byy86WWgU+lEnL ztGw== X-Forwarded-Encrypted: i=1; AJvYcCUyOIzXX8FQAAtmew0F/Hf1y+VA9SCbsbmM0UT0aPvIXE2e5OQxRdGZFJJioK/1neyl2pNC5AUDBGCSEQZKGN7MOe01FZ05WjfYFK5K X-Gm-Message-State: AOJu0YyIx8ZBLIr6Or6D+RUnm/5/qfIKafAqta1UBh0Uo+ERsVQnZ6R3 EQgdxxvf4rdwVPoHRftbKWckjDOSKafB0ecRmuPh9JuuVTiUkF1tKXS3GVi08zY= X-Google-Smtp-Source: AGHT+IHi9nm9iUmihVl+nUYkbY20SKDAPRl8ovl9feERHmDZj2/wHFbeuoMxKwaBgbMtCXTT0l1DLA== X-Received: by 2002:a05:6e02:1aa5:b0:36b:3c05:7163 with SMTP id l5-20020a056e021aa500b0036b3c057163mr309979ilv.32.1713473258189; Thu, 18 Apr 2024 13:47:38 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id r6-20020a056638300600b00484948cb8f5sm626998jak.91.2024.04.18.13.47.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 13:47:37 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: mka@chromium.org, andersson@kernel.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/8] net: ipa: only enable the SUSPEND IPA interrupt when needed Date: Thu, 18 Apr 2024 15:47:23 -0500 Message-Id: <20240418204729.1952353-3-elder@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240418204729.1952353-1-elder@linaro.org> References: <20240418204729.1952353-1-elder@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Only enable the SUSPEND IPA interrupt type when at least one endpoint has that interrupt enabled. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_interrupt.c | 8 ++++++++ drivers/net/ipa/ipa_power.c | 11 +---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/net/ipa/ipa_interrupt.c b/drivers/net/ipa/ipa_interrup= t.c index 0e8d4e43275ea..e198712d46ebb 100644 --- a/drivers/net/ipa/ipa_interrupt.c +++ b/drivers/net/ipa/ipa_interrupt.c @@ -196,6 +196,7 @@ static void ipa_interrupt_suspend_control(struct ipa_in= terrupt *interrupt, u32 mask =3D BIT(endpoint_id % 32); u32 unit =3D endpoint_id / 32; const struct reg *reg; + unsigned long weight; u32 offset; u32 val; =20 @@ -205,6 +206,10 @@ static void ipa_interrupt_suspend_control(struct ipa_i= nterrupt *interrupt, if (ipa->version =3D=3D IPA_VERSION_3_0) return; =20 + weight =3D bitmap_weight(interrupt->suspend_enabled, ipa->endpoint_count); + if (weight =3D=3D 1 && !enable) + ipa_interrupt_disable(ipa, IPA_IRQ_TX_SUSPEND); + reg =3D ipa_reg(ipa, IRQ_SUSPEND_EN); offset =3D reg_n_offset(reg, unit); val =3D ioread32(ipa->reg_virt + offset); @@ -216,6 +221,9 @@ static void ipa_interrupt_suspend_control(struct ipa_in= terrupt *interrupt, __change_bit(endpoint_id, interrupt->suspend_enabled); =20 iowrite32(val, ipa->reg_virt + offset); + + if (!weight && enable) + ipa_interrupt_enable(ipa, IPA_IRQ_TX_SUSPEND); } =20 /* Enable TX_SUSPEND for an endpoint */ diff --git a/drivers/net/ipa/ipa_power.c b/drivers/net/ipa/ipa_power.c index 41ca7ef5e20fc..bdbcf965d5a30 100644 --- a/drivers/net/ipa/ipa_power.c +++ b/drivers/net/ipa/ipa_power.c @@ -234,21 +234,12 @@ void ipa_power_retention(struct ipa *ipa, bool enable) =20 int ipa_power_setup(struct ipa *ipa) { - int ret; - - ipa_interrupt_enable(ipa, IPA_IRQ_TX_SUSPEND); - - ret =3D device_init_wakeup(ipa->dev, true); - if (ret) - ipa_interrupt_disable(ipa, IPA_IRQ_TX_SUSPEND); - - return ret; + return device_init_wakeup(ipa->dev, true); } =20 void ipa_power_teardown(struct ipa *ipa) { (void)device_init_wakeup(ipa->dev, false); - ipa_interrupt_disable(ipa, IPA_IRQ_TX_SUSPEND); } =20 /* Initialize IPA power management */ --=20 2.40.1 From nobody Fri Feb 13 17:30:46 2026 Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5604E194C86 for ; Thu, 18 Apr 2024 20:47:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473262; cv=none; b=NMbaGgkKigZ8JZryfDt4cadl1pJbjftMch4DI/1orfstBK2xCSL7gNCzBvhUFlHD1tZiuIiF4gPSEGl0DoXWH1+s7FfbI9agHGGm1WQ0Lzu7Di5B13K93VRRIXYjTGtLIRchsY58ZAcJVuAJI/lf2fVecxjzvsVBG4pCUmVp7ns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473262; c=relaxed/simple; bh=my3ly2Wt8vx7EPER+SS+EO/A3WGEO8ar2dDMeRrSXqs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WIb364AwEQli6FhgkabWI4YyGnLdNdfZfm0Xfh18TdzMGmncXqdkZVJJn4zWhxjTQ5UErTjP272OcLMefM9F9Q3mUzVv2+fgfXUA2eat6usFYhEOVEdkMO/kqEswmNIYslbr+BkB0E7zuE+zKqkgl91J0MxGIqdyXoZyIFmZSXU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=AbKW/29n; arc=none smtp.client-ip=209.85.166.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="AbKW/29n" Received: by mail-il1-f180.google.com with SMTP id e9e14a558f8ab-36a1e9b94d4so5626505ab.1 for ; Thu, 18 Apr 2024 13:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713473259; x=1714078059; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oFdFgfCb4QOPydRGJlzZ64gSPyRyXCV7EEtNqm4BTfY=; b=AbKW/29nNF7+Qsr8Gn2DcHE4JSwEwYEs5fgbAVEiOvl8Iz4xeDfydcSQWKeLy/3Anw /h2VhME0gHtTaL4yM/AeQFWVr3aEdEYy6XNdH2W4WSciHLWXqpci5E1A4y2OpNsD1fuX 8htgsCzbBLMjYIW/WbSa+JhySOvzixVVuSDRYJAajBr2JmtBknF+H2ve6EuFj5UOd+FF micIqPMcRgQ3xsDkvehPVujNoEVFBBfeJ3iPaL0e+Cwc78doTiihJ26+kIp3SmpGYTma ajT/AHAflZ25kY4TpoWKRRJpTzZxSCpLyVIgaH0nmazeAZPmnnbhXOFHVel90fGhPxCn cv5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713473259; x=1714078059; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oFdFgfCb4QOPydRGJlzZ64gSPyRyXCV7EEtNqm4BTfY=; b=Fo9ha/mSgsCL+qjrL2IuC4TprJj/WQkTsgF0lnQTLA1qq/pQlrId7ZXJgA65e75HxR zCzDD9EEVHPFwDZ1Vrs3PpVM1bE4y/OkVeVOWbVhjC2h3PrfGSS4GeOUNyFsT1IZkAca VuoX1iR6j9/oWKMg5p57jxfeWywiIGXFYjRWHhkX0+VX/Kgxj2ddmBPvlOyL6sz2y7c4 y5V9/i+64sEqxoTJ2ODfpI2ftL1ZfiMMhCmQFasHOKdCQWXuKUE9upArB8he4mma7OhL 5t1HYhGZEWPsTvrc4uy0orpOXLWx5oUN2jusOuofaL0iIxN5J2LcRnoac4DhpaMK/fnc P79w== X-Forwarded-Encrypted: i=1; AJvYcCXrv9AgaNw4jZ+PbU3C8x02LXZ6nOOmACYIaNeSZ82TyfqveATbX18cf/37Db+b2PXSUOeWamtYGo8y8hAkIjvXd2H/wBjazipbjHD0 X-Gm-Message-State: AOJu0Yw2jlPPj24GmfwKPjagywRmdqXSYcBOywrS9fvtS82CDojwYZqy j2sOlnX20967TReXGxxmzcq9+/hgsXIJG6AUaw70DYgnSjhmy0hB1cJiuV2TUSV0cOnTuEjruJh N X-Google-Smtp-Source: AGHT+IEVvi8jk4ox6CtFUWga062IqyvpAfeDY8vVQOMWIqClYhZqkkPQVN715E8NcqDiYKetdI1f6w== X-Received: by 2002:a05:6e02:1ca3:b0:36a:b4f3:7731 with SMTP id x3-20020a056e021ca300b0036ab4f37731mr361266ill.7.1713473259548; Thu, 18 Apr 2024 13:47:39 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id r6-20020a056638300600b00484948cb8f5sm626998jak.91.2024.04.18.13.47.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 13:47:39 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: mka@chromium.org, andersson@kernel.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 3/8] net: ipa: call device_init_wakeup() earlier Date: Thu, 18 Apr 2024 15:47:24 -0500 Message-Id: <20240418204729.1952353-4-elder@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240418204729.1952353-1-elder@linaro.org> References: <20240418204729.1952353-1-elder@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, enabling wakeup for the IPA device doesn't occur until the setup phase of initialization (in ipa_power_setup()). There is no need to delay doing that, however. We can conveniently do it during the config phase, in ipa_interrupt_config(), where we enable power management wakeup mode for the IPA interrupt. Moving the device_init_wakeup() out of ipa_power_setup() leaves that function empty, so it can just be eliminated. Similarly, rearrange all of the matching inverse calls, disabling device wakeup in ipa_interrupt_deconfig() and removing that function as well. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_interrupt.c | 11 ++++++++++- drivers/net/ipa/ipa_main.c | 7 ------- drivers/net/ipa/ipa_power.c | 10 ---------- drivers/net/ipa/ipa_power.h | 14 -------------- 4 files changed, 10 insertions(+), 32 deletions(-) diff --git a/drivers/net/ipa/ipa_interrupt.c b/drivers/net/ipa/ipa_interrup= t.c index e198712d46ebb..a9a2c34115b5b 100644 --- a/drivers/net/ipa/ipa_interrupt.c +++ b/drivers/net/ipa/ipa_interrupt.c @@ -277,17 +277,25 @@ int ipa_interrupt_config(struct ipa *ipa) goto err_free_bitmap; } =20 + ret =3D device_init_wakeup(dev, true); + if (ret) { + dev_err(dev, "error %d enabling wakeup\n", ret); + goto err_free_irq; + } + ret =3D dev_pm_set_wake_irq(dev, irq); if (ret) { dev_err(dev, "error %d registering \"ipa\" IRQ as wakeirq\n", ret); - goto err_free_irq; + goto err_disable_wakeup; } =20 ipa->interrupt =3D interrupt; =20 return 0; =20 +err_disable_wakeup: + (void)device_init_wakeup(dev, false); err_free_irq: free_irq(interrupt->irq, interrupt); err_free_bitmap: @@ -307,6 +315,7 @@ void ipa_interrupt_deconfig(struct ipa *ipa) ipa->interrupt =3D NULL; =20 dev_pm_clear_wake_irq(dev); + (void)device_init_wakeup(dev, false); free_irq(interrupt->irq, interrupt); bitmap_free(interrupt->suspend_enabled); } diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c index 57b241417e8cd..59e7abb4a0d19 100644 --- a/drivers/net/ipa/ipa_main.c +++ b/drivers/net/ipa/ipa_main.c @@ -120,10 +120,6 @@ int ipa_setup(struct ipa *ipa) if (ret) return ret; =20 - ret =3D ipa_power_setup(ipa); - if (ret) - goto err_gsi_teardown; - ipa_endpoint_setup(ipa); =20 /* We need to use the AP command TX endpoint to perform other @@ -170,8 +166,6 @@ int ipa_setup(struct ipa *ipa) ipa_endpoint_disable_one(command_endpoint); err_endpoint_teardown: ipa_endpoint_teardown(ipa); - ipa_power_teardown(ipa); -err_gsi_teardown: gsi_teardown(&ipa->gsi); =20 return ret; @@ -196,7 +190,6 @@ static void ipa_teardown(struct ipa *ipa) command_endpoint =3D ipa->name_map[IPA_ENDPOINT_AP_COMMAND_TX]; ipa_endpoint_disable_one(command_endpoint); ipa_endpoint_teardown(ipa); - ipa_power_teardown(ipa); gsi_teardown(&ipa->gsi); } =20 diff --git a/drivers/net/ipa/ipa_power.c b/drivers/net/ipa/ipa_power.c index bdbcf965d5a30..881bf9147b190 100644 --- a/drivers/net/ipa/ipa_power.c +++ b/drivers/net/ipa/ipa_power.c @@ -232,16 +232,6 @@ void ipa_power_retention(struct ipa *ipa, bool enable) ret, enable ? "en" : "dis"); } =20 -int ipa_power_setup(struct ipa *ipa) -{ - return device_init_wakeup(ipa->dev, true); -} - -void ipa_power_teardown(struct ipa *ipa) -{ - (void)device_init_wakeup(ipa->dev, false); -} - /* Initialize IPA power management */ struct ipa_power * ipa_power_init(struct device *dev, const struct ipa_power_data *data) diff --git a/drivers/net/ipa/ipa_power.h b/drivers/net/ipa/ipa_power.h index 227cc04bea806..df93b07415f2a 100644 --- a/drivers/net/ipa/ipa_power.h +++ b/drivers/net/ipa/ipa_power.h @@ -30,20 +30,6 @@ u32 ipa_core_clock_rate(struct ipa *ipa); */ void ipa_power_retention(struct ipa *ipa, bool enable); =20 -/** - * ipa_power_setup() - Set up IPA power management - * @ipa: IPA pointer - * - * Return: 0 if successful, or a negative error code - */ -int ipa_power_setup(struct ipa *ipa); - -/** - * ipa_power_teardown() - Inverse of ipa_power_setup() - * @ipa: IPA pointer - */ -void ipa_power_teardown(struct ipa *ipa); - /** * ipa_power_init() - Initialize IPA power management * @dev: IPA device --=20 2.40.1 From nobody Fri Feb 13 17:30:46 2026 Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC719199E97 for ; Thu, 18 Apr 2024 20:47:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473263; cv=none; b=biulAyU0/QSnXbQLVXUnWKyIewv055j/xH0oJRSA36sXLOBymHcz/wQ7EbvP3PT1aS56XwHcCDF2ZaCSUIF0RFiGjR7WvcnM9UXf2PLgoLTLAT4qu/rrC1+TsbPMvdoQv99E6gr9UqzjYKvS2rVpp5jnlLlAghgsYtssjvWt+Ag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473263; c=relaxed/simple; bh=xghA/IKe2+zJPaTSn22evp4r7tz7T7gc2ns6uAWCT3E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tBqSN9hiPySnyVoTaSNsr2s2WxMqCKGEncHilEQlMIyUrO4Q206o5JFsoYuXYHsY0YPKKnuSD7z84nm2Uv9Cya3/NCcNmTOyiP822tENn2/ksHt+pSLR5hJCAQvLLFJtluAmhbVUf5Y49QY73Z6/N3qtv+qI3LlEbtN7GCOI3G0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=e4JaIsLe; arc=none smtp.client-ip=209.85.166.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="e4JaIsLe" Received: by mail-il1-f178.google.com with SMTP id e9e14a558f8ab-36b1774e453so4130135ab.1 for ; Thu, 18 Apr 2024 13:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713473261; x=1714078061; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xiHSwsewvF6JA/i3n1XYlFUoFzpIo8xMcAilX3ipKIk=; b=e4JaIsLeepF5UVLgjighmAWDK3ul/kn2UyM5P+jo5DdJOjcCi52Hk6dcfq37L6/JPy liwQci/qiRskQR/cs6cvXxeZc9HvIWUFww/J+7IV+x/MGkk+DR3xtBq4wo77klTbDAgf Ll/I8Lx//0EaxAVF8q5L/rgIlLsbRam4zFlQ9h21PiQyRPDx9HlBVKe8GfUf6Kx/OCLX eJK5Kf7j9Z1GmEoJulBVSjhWy9csUjgQs14MqkC/1/5Vkyzff2o6vZMF+C+tQ1rhILUZ Ih2gIoj0hEYu0BLSSBmXwjK9X931zXo8Rc3dUv42+pyKSVkWkfUzLji7J6/wwe6G1PUu v8QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713473261; x=1714078061; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xiHSwsewvF6JA/i3n1XYlFUoFzpIo8xMcAilX3ipKIk=; b=Jr8IpQgVyYucLF5vckpGLuQCLotRI65LZXylM2C80PpSv2u8hF+v/LNM7f75X81jRU Xk6BVhkkDY2Lu9h84oV90M7hO15Ttfrd16dJ5Whhi6wByP9xmyfUfREOCbH+Xfl4K2Pc ODzWVJ7aTNrIjZJgrSzkggZF3UxBtALdXCpsEXxT/VH3h6RIbCCDxs3Oc495FqTEWvSU IRoYJWdDtBwo4KBfCR4hoFqhrSgp25DjnkUVctUVwkQyWO3fd6F4LGgUlBXVKORFHeig HYL/XmUJh5SJlzz6O7dSCdDpFjiDgJjZCLag5wp/831+0eSosV5ZWVY2NZVw5AdDbXJw i0KQ== X-Forwarded-Encrypted: i=1; AJvYcCXFFGlsqJ5qCYMOKxlMtRmMm+oSkJk3TTmkTsRp0fPa9fSRqb2VuJiW9kTlwTveK/WXz+Ei5oNVhxnfsDl6QZbS3D8xXloUHdUCxP3J X-Gm-Message-State: AOJu0YzM3swX7W+He7jn4WKX1vE9Alx1SW7mkPgsK2jGV+fWsBDpSQ1y OvZ0VWCUCcCY59OayXj8SiU623Mkyf+UDyaAtJ7DK6pdKjWArCOuVpQ4xYOEsQI= X-Google-Smtp-Source: AGHT+IGQ6BTpypWpACqqIEmHjce8/fc1/vHZDxgj0kcIec3Y2dkFk6ndzqZ7423P1OzFVdQi2pRFLg== X-Received: by 2002:a05:6e02:1541:b0:36b:3a3b:b2c0 with SMTP id j1-20020a056e02154100b0036b3a3bb2c0mr318004ilu.32.1713473260872; Thu, 18 Apr 2024 13:47:40 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id r6-20020a056638300600b00484948cb8f5sm626998jak.91.2024.04.18.13.47.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 13:47:40 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: mka@chromium.org, andersson@kernel.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 4/8] net: ipa: remove unneeded FILT_ROUT_HASH_EN definitions Date: Thu, 18 Apr 2024 15:47:25 -0500 Message-Id: <20240418204729.1952353-5-elder@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240418204729.1952353-1-elder@linaro.org> References: <20240418204729.1952353-1-elder@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The FILT_ROUT_HASH_EN register is only used for IPA v4.2. There, routing and filter table hashing are not supported, and so the register must be written to disable the feature. No other version uses this register, so its definition can be removed. If we need to use these some day (for example, explicitly enable the feature) this commit can be reverted. Signed-off-by: Alex Elder --- drivers/net/ipa/reg/ipa_reg-v3.1.c | 14 -------------- drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 14 -------------- drivers/net/ipa/reg/ipa_reg-v4.11.c | 14 -------------- drivers/net/ipa/reg/ipa_reg-v4.5.c | 14 -------------- drivers/net/ipa/reg/ipa_reg-v4.7.c | 14 -------------- drivers/net/ipa/reg/ipa_reg-v4.9.c | 14 -------------- 6 files changed, 84 deletions(-) diff --git a/drivers/net/ipa/reg/ipa_reg-v3.1.c b/drivers/net/ipa/reg/ipa_r= eg-v3.1.c index 648dbfe1fce3a..df20f9194efb8 100644 --- a/drivers/net/ipa/reg/ipa_reg-v3.1.c +++ b/drivers/net/ipa/reg/ipa_reg-v3.1.c @@ -76,19 +76,6 @@ static const u32 reg_qsb_max_reads_fmask[] =3D { =20 REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078); =20 -static const u32 reg_filt_rout_hash_en_fmask[] =3D { - [IPV6_ROUTER_HASH] =3D BIT(0), - /* Bits 1-3 reserved */ - [IPV6_FILTER_HASH] =3D BIT(4), - /* Bits 5-7 reserved */ - [IPV4_ROUTER_HASH] =3D BIT(8), - /* Bits 9-11 reserved */ - [IPV4_FILTER_HASH] =3D BIT(12), - /* Bits 13-31 reserved */ -}; - -REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x000008c); - static const u32 reg_filt_rout_hash_flush_fmask[] =3D { [IPV6_ROUTER_HASH] =3D BIT(0), /* Bits 1-3 reserved */ @@ -403,7 +390,6 @@ static const struct reg *reg_array[] =3D { [SHARED_MEM_SIZE] =3D ®_shared_mem_size, [QSB_MAX_WRITES] =3D ®_qsb_max_writes, [QSB_MAX_READS] =3D ®_qsb_max_reads, - [FILT_ROUT_HASH_EN] =3D ®_filt_rout_hash_en, [FILT_ROUT_HASH_FLUSH] =3D ®_filt_rout_hash_flush, [STATE_AGGR_ACTIVE] =3D ®_state_aggr_active, [IPA_BCR] =3D ®_ipa_bcr, diff --git a/drivers/net/ipa/reg/ipa_reg-v3.5.1.c b/drivers/net/ipa/reg/ipa= _reg-v3.5.1.c index 78b1bf60cd024..1f8c0457529e1 100644 --- a/drivers/net/ipa/reg/ipa_reg-v3.5.1.c +++ b/drivers/net/ipa/reg/ipa_reg-v3.5.1.c @@ -81,19 +81,6 @@ static const u32 reg_qsb_max_reads_fmask[] =3D { =20 REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078); =20 -static const u32 reg_filt_rout_hash_en_fmask[] =3D { - [IPV6_ROUTER_HASH] =3D BIT(0), - /* Bits 1-3 reserved */ - [IPV6_FILTER_HASH] =3D BIT(4), - /* Bits 5-7 reserved */ - [IPV4_ROUTER_HASH] =3D BIT(8), - /* Bits 9-11 reserved */ - [IPV4_FILTER_HASH] =3D BIT(12), - /* Bits 13-31 reserved */ -}; - -REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x000008c); - static const u32 reg_filt_rout_hash_flush_fmask[] =3D { [IPV6_ROUTER_HASH] =3D BIT(0), /* Bits 1-3 reserved */ @@ -414,7 +401,6 @@ static const struct reg *reg_array[] =3D { [SHARED_MEM_SIZE] =3D ®_shared_mem_size, [QSB_MAX_WRITES] =3D ®_qsb_max_writes, [QSB_MAX_READS] =3D ®_qsb_max_reads, - [FILT_ROUT_HASH_EN] =3D ®_filt_rout_hash_en, [FILT_ROUT_HASH_FLUSH] =3D ®_filt_rout_hash_flush, [STATE_AGGR_ACTIVE] =3D ®_state_aggr_active, [IPA_BCR] =3D ®_ipa_bcr, diff --git a/drivers/net/ipa/reg/ipa_reg-v4.11.c b/drivers/net/ipa/reg/ipa_= reg-v4.11.c index 29e71cce4a843..ba21a6c655c88 100644 --- a/drivers/net/ipa/reg/ipa_reg-v4.11.c +++ b/drivers/net/ipa/reg/ipa_reg-v4.11.c @@ -113,19 +113,6 @@ static const u32 reg_qsb_max_reads_fmask[] =3D { =20 REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078); =20 -static const u32 reg_filt_rout_hash_en_fmask[] =3D { - [IPV6_ROUTER_HASH] =3D BIT(0), - /* Bits 1-3 reserved */ - [IPV6_FILTER_HASH] =3D BIT(4), - /* Bits 5-7 reserved */ - [IPV4_ROUTER_HASH] =3D BIT(8), - /* Bits 9-11 reserved */ - [IPV4_FILTER_HASH] =3D BIT(12), - /* Bits 13-31 reserved */ -}; - -REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x0000148); - static const u32 reg_filt_rout_hash_flush_fmask[] =3D { [IPV6_ROUTER_HASH] =3D BIT(0), /* Bits 1-3 reserved */ @@ -470,7 +457,6 @@ static const struct reg *reg_array[] =3D { [SHARED_MEM_SIZE] =3D ®_shared_mem_size, [QSB_MAX_WRITES] =3D ®_qsb_max_writes, [QSB_MAX_READS] =3D ®_qsb_max_reads, - [FILT_ROUT_HASH_EN] =3D ®_filt_rout_hash_en, [FILT_ROUT_HASH_FLUSH] =3D ®_filt_rout_hash_flush, [STATE_AGGR_ACTIVE] =3D ®_state_aggr_active, [LOCAL_PKT_PROC_CNTXT] =3D ®_local_pkt_proc_cntxt, diff --git a/drivers/net/ipa/reg/ipa_reg-v4.5.c b/drivers/net/ipa/reg/ipa_r= eg-v4.5.c index 1c58f78851c21..90fd749b43eba 100644 --- a/drivers/net/ipa/reg/ipa_reg-v4.5.c +++ b/drivers/net/ipa/reg/ipa_reg-v4.5.c @@ -107,19 +107,6 @@ static const u32 reg_qsb_max_reads_fmask[] =3D { =20 REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078); =20 -static const u32 reg_filt_rout_hash_en_fmask[] =3D { - [IPV6_ROUTER_HASH] =3D BIT(0), - /* Bits 1-3 reserved */ - [IPV6_FILTER_HASH] =3D BIT(4), - /* Bits 5-7 reserved */ - [IPV4_ROUTER_HASH] =3D BIT(8), - /* Bits 9-11 reserved */ - [IPV4_FILTER_HASH] =3D BIT(12), - /* Bits 13-31 reserved */ -}; - -REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x0000148); - static const u32 reg_filt_rout_hash_flush_fmask[] =3D { [IPV6_ROUTER_HASH] =3D BIT(0), /* Bits 1-3 reserved */ @@ -489,7 +476,6 @@ static const struct reg *reg_array[] =3D { [SHARED_MEM_SIZE] =3D ®_shared_mem_size, [QSB_MAX_WRITES] =3D ®_qsb_max_writes, [QSB_MAX_READS] =3D ®_qsb_max_reads, - [FILT_ROUT_HASH_EN] =3D ®_filt_rout_hash_en, [FILT_ROUT_HASH_FLUSH] =3D ®_filt_rout_hash_flush, [STATE_AGGR_ACTIVE] =3D ®_state_aggr_active, [LOCAL_PKT_PROC_CNTXT] =3D ®_local_pkt_proc_cntxt, diff --git a/drivers/net/ipa/reg/ipa_reg-v4.7.c b/drivers/net/ipa/reg/ipa_r= eg-v4.7.c index 731824fce1d4a..ebae61d10eadb 100644 --- a/drivers/net/ipa/reg/ipa_reg-v4.7.c +++ b/drivers/net/ipa/reg/ipa_reg-v4.7.c @@ -107,19 +107,6 @@ static const u32 reg_qsb_max_reads_fmask[] =3D { =20 REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078); =20 -static const u32 reg_filt_rout_hash_en_fmask[] =3D { - [IPV6_ROUTER_HASH] =3D BIT(0), - /* Bits 1-3 reserved */ - [IPV6_FILTER_HASH] =3D BIT(4), - /* Bits 5-7 reserved */ - [IPV4_ROUTER_HASH] =3D BIT(8), - /* Bits 9-11 reserved */ - [IPV4_FILTER_HASH] =3D BIT(12), - /* Bits 13-31 reserved */ -}; - -REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x0000148); - static const u32 reg_filt_rout_hash_flush_fmask[] =3D { [IPV6_ROUTER_HASH] =3D BIT(0), /* Bits 1-3 reserved */ @@ -462,7 +449,6 @@ static const struct reg *reg_array[] =3D { [SHARED_MEM_SIZE] =3D ®_shared_mem_size, [QSB_MAX_WRITES] =3D ®_qsb_max_writes, [QSB_MAX_READS] =3D ®_qsb_max_reads, - [FILT_ROUT_HASH_EN] =3D ®_filt_rout_hash_en, [FILT_ROUT_HASH_FLUSH] =3D ®_filt_rout_hash_flush, [STATE_AGGR_ACTIVE] =3D ®_state_aggr_active, [LOCAL_PKT_PROC_CNTXT] =3D ®_local_pkt_proc_cntxt, diff --git a/drivers/net/ipa/reg/ipa_reg-v4.9.c b/drivers/net/ipa/reg/ipa_r= eg-v4.9.c index 01f87b5290e01..f488f68603d07 100644 --- a/drivers/net/ipa/reg/ipa_reg-v4.9.c +++ b/drivers/net/ipa/reg/ipa_reg-v4.9.c @@ -112,19 +112,6 @@ static const u32 reg_qsb_max_reads_fmask[] =3D { =20 REG_FIELDS(QSB_MAX_READS, qsb_max_reads, 0x00000078); =20 -static const u32 reg_filt_rout_hash_en_fmask[] =3D { - [IPV6_ROUTER_HASH] =3D BIT(0), - /* Bits 1-3 reserved */ - [IPV6_FILTER_HASH] =3D BIT(4), - /* Bits 5-7 reserved */ - [IPV4_ROUTER_HASH] =3D BIT(8), - /* Bits 9-11 reserved */ - [IPV4_FILTER_HASH] =3D BIT(12), - /* Bits 13-31 reserved */ -}; - -REG_FIELDS(FILT_ROUT_HASH_EN, filt_rout_hash_en, 0x0000148); - static const u32 reg_filt_rout_hash_flush_fmask[] =3D { [IPV6_ROUTER_HASH] =3D BIT(0), /* Bits 1-3 reserved */ @@ -467,7 +454,6 @@ static const struct reg *reg_array[] =3D { [SHARED_MEM_SIZE] =3D ®_shared_mem_size, [QSB_MAX_WRITES] =3D ®_qsb_max_writes, [QSB_MAX_READS] =3D ®_qsb_max_reads, - [FILT_ROUT_HASH_EN] =3D ®_filt_rout_hash_en, [FILT_ROUT_HASH_FLUSH] =3D ®_filt_rout_hash_flush, [STATE_AGGR_ACTIVE] =3D ®_state_aggr_active, [LOCAL_PKT_PROC_CNTXT] =3D ®_local_pkt_proc_cntxt, --=20 2.40.1 From nobody Fri Feb 13 17:30:46 2026 Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E408419DF46 for ; Thu, 18 Apr 2024 20:47:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473265; cv=none; b=ZGlkNUqRcja4beXk34gtjf2HHHBKxGmEkxbjP6OuOXobJmdIaH4gvRWr7pVVJtNglWzACQfVQPcDY65zG/IOBjXat9OTPffpK/Zb5BtEIbEQfku5jd4RbnOFvUrZkojNf96W01bsW+bNXhmDuEB5jILjrXE4PLlJPVobgW1JTXg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473265; c=relaxed/simple; bh=/O26O0SPwaQndb7Gk11BnaA079JRAE9KvwG8Uy+fgkI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=g1QscAvH7QurKZDCMarA3sqhRJqi3EWpG+Mp8hL6Iwf7CyOUWUrnycyzIbwnjQbF/pXN2VJjynKbCAD3tSxGkXpo0fLrQ029fdLDQ+WmAJ/S3ZDUENL9SgtNjQPJ6X1SZHf/uQWVRaJEkbyI4XrfjLV2ZffTKEIW3uTDRs0009U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ZYjQt/ct; arc=none smtp.client-ip=209.85.166.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ZYjQt/ct" Received: by mail-io1-f46.google.com with SMTP id ca18e2360f4ac-7d6b0c766e9so45659039f.0 for ; Thu, 18 Apr 2024 13:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713473262; x=1714078062; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=H3Jy4pWunk3gIi2kTc2gXOgQDTDQJh8keviaOUz7uIE=; b=ZYjQt/ct3cSn6dvp1SKUcDXcgH2FKAR52Q3W2nIGlJJGgaTvC/4zZFVFT2etV6rday O5mKZshbjyXK9iXvziVoRcdPICnO38fguID/IFrxhMRrtK603J+pUvfajz3BXmE2UlqE 1T6pi4HzGsjrprgJBxGgUqc7PnRb0Rzvv0FDNATLKqny6+sZUl+eZzhE5IRZLjbQuRm/ 1mnYhWBVDFhyQzarDCAoP29U/nR+xl/E2HVPstkqsVIFmAGa6MayucaK+p8+dFfJZjsO xbl0+Lqqt1DMFHytNbr1JoIickSFBT5IjubMu8NEHI3RXlAJYWz1EUczTZHVt4+OEf6j E9HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713473262; x=1714078062; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H3Jy4pWunk3gIi2kTc2gXOgQDTDQJh8keviaOUz7uIE=; b=tx7IRLpuofKA5QS+vgdgz4SYYVggB0etidaxrUogEekii4Iu7/qxe3rQ4PZGSdP32B NdQ1hoxeuDqkkIGPn5lPCe/jfwDHpTq0UtXri8pLobtsixfrxM6gz2ipYbtU5OXr1QnF 61Wm8CH/kd1frjqwHC+5G72X7jy811NQ5X3oWRtZwucTxfqPI0/Gkx9gElq1o5q1mHkt m3s7dWCTHJ7fkHPrZNN7OK/n4O1Lr7Cb8842M1BuYCULx0qGIo06k1rBN9GkgAik4+ut MefnVdcUr3NK3Etz1gbrnDY/9ncM8mp8U6bmJEo6+WezD78jfxkGv83W+mfDkzNAUa4K FsfQ== X-Forwarded-Encrypted: i=1; AJvYcCUvGtqyh2wjA8GrfQyocwpTDln9JW0X0bOKr7YzHrF4lxbZamcTrV4nnHiYIUZdMyHUYKAGVq21nUdjp1l13J0f5UyFcc0Dno9sJbS6 X-Gm-Message-State: AOJu0Yy8OLSKX409cS7+LLUMvWP4jg2nsQDRg9gby3qQZjYu1QlqlOLr p2oeDjVhDrVNZ198szp9oXf8JZ9BC4Os5Op0BDQ6ye+LWt3XPX2hntdKKH8gRnGE3g6edQa5hlf Z X-Google-Smtp-Source: AGHT+IG8BLSKKt4Z+OUV/Ccbn8w8o09vBKQ7lL5VpQxMYtcdH5yIUGgB0k1msp2eDPQ+0DIyHdZwIw== X-Received: by 2002:a5e:8b04:0:b0:7da:1911:8a9f with SMTP id g4-20020a5e8b04000000b007da19118a9fmr468131iok.4.1713473262075; Thu, 18 Apr 2024 13:47:42 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id r6-20020a056638300600b00484948cb8f5sm626998jak.91.2024.04.18.13.47.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 13:47:41 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: mka@chromium.org, andersson@kernel.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 5/8] net: ipa: make ipa_table_hash_support() a real function Date: Thu, 18 Apr 2024 15:47:26 -0500 Message-Id: <20240418204729.1952353-6-elder@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240418204729.1952353-1-elder@linaro.org> References: <20240418204729.1952353-1-elder@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" With the exception of ipa_table_hash_support(), nothing defined in "ipa_table.h" requires the full definition of the IPA structure. Change that function to be a "real" function rather than an inline, to avoid requring the IPA structure to be defined. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_table.c | 8 +++++++- drivers/net/ipa/ipa_table.h | 7 ++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/ipa/ipa_table.c b/drivers/net/ipa/ipa_table.c index a24ac11b8893d..9b4bb6d3f152a 100644 --- a/drivers/net/ipa/ipa_table.c +++ b/drivers/net/ipa/ipa_table.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 =20 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. - * Copyright (C) 2018-2023 Linaro Ltd. + * Copyright (C) 2018-2024 Linaro Ltd. */ =20 #include @@ -161,6 +161,12 @@ ipa_table_mem(struct ipa *ipa, bool filter, bool hashe= d, bool ipv6) return ipa_mem_find(ipa, mem_id); } =20 +/* Return true if hashed tables are supported */ +bool ipa_table_hash_support(struct ipa *ipa) +{ + return ipa->version !=3D IPA_VERSION_4_2; +} + bool ipa_filtered_valid(struct ipa *ipa, u64 filtered) { struct device *dev =3D ipa->dev; diff --git a/drivers/net/ipa/ipa_table.h b/drivers/net/ipa/ipa_table.h index 7cc951904bb48..16d4d15df9e9c 100644 --- a/drivers/net/ipa/ipa_table.h +++ b/drivers/net/ipa/ipa_table.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ =20 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. - * Copyright (C) 2019-2022 Linaro Ltd. + * Copyright (C) 2019-2024 Linaro Ltd. */ #ifndef _IPA_TABLE_H_ #define _IPA_TABLE_H_ @@ -23,10 +23,7 @@ bool ipa_filtered_valid(struct ipa *ipa, u64 filtered); * ipa_table_hash_support() - Return true if hashed tables are supported * @ipa: IPA pointer */ -static inline bool ipa_table_hash_support(struct ipa *ipa) -{ - return ipa->version !=3D IPA_VERSION_4_2; -} +bool ipa_table_hash_support(struct ipa *ipa); =20 /** * ipa_table_reset() - Reset filter and route tables entries to "none" --=20 2.40.1 From nobody Fri Feb 13 17:30:46 2026 Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3074219DF74 for ; Thu, 18 Apr 2024 20:47:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473265; cv=none; b=H9DpOE1itRodPj7Qt4SESoCJinLNxrdHaUai7a6j0O3tor9AlusMpx3+GGW5FISTxjoQ7y2Ic2s80BXmgw4AhdhJH2lN1NRl3PahSIIKXneZPj8DrZVrG4roNnNNUG2ThJJAtfeBGc8zdg/4cTu+AsU8Vws7X25qJ2dNxXZcdcg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473265; c=relaxed/simple; bh=XyYpi71wJ0gs3n01rlT/IbyAJXkfH9+nq2GSfnQ1k/w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IEJev0sPzX5GuU3Dk/YJm7Qn/6DS60Ii3PzVims0yYOMSh8q572oL4is4bw4MLhNn0QVq9WlXGbt2NXguMgL9Y69zajWzQ378xjB1R2d/fPNDcnGAzvaYpsyWvESrxk7mEpqkyGZQan55vcWpWQEhkozpG4Zfppq3MgMNY34LC0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ZZPLlPP+; arc=none smtp.client-ip=209.85.166.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ZZPLlPP+" Received: by mail-io1-f52.google.com with SMTP id ca18e2360f4ac-7da04b08b82so41235939f.0 for ; Thu, 18 Apr 2024 13:47:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713473263; x=1714078063; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fi0Ji6XcxTq7nWZptSfD6FmyaTvUSY/Oz6qXD8maVXs=; b=ZZPLlPP+4XDZ7PF63LsFgJPul7de2gSxgeQkiiEHeEcL5yRoY+BERT55BVILhV2In9 IpXomHHSleFX90PDxkK/L9hOD8CuR9OhUhCfs8c8oLk1yCcjLPJR1P4xiUTavlICFe7y nRsk/wpWEw8HrrB0hNEFiKo2SF8o6WMAOovfG2dGBUNxSrtLIGN7CcG8bX17nkc7YYLa 0c3cFr6J3ImAVT+t1Q1N164q8SGIqfKa/LlyxASKIijsvuC6shtmJYQo6eYMgKxdKrHU clLABJ8NAdQ0NmkZzmUErd/B1B+FQzKmbaYowY/8N2dkpDbIr8AkMsSx/w65N0KUxZnj 3d5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713473263; x=1714078063; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fi0Ji6XcxTq7nWZptSfD6FmyaTvUSY/Oz6qXD8maVXs=; b=DRluFduta/wbd+VrnWY33DgrmBTVLquREv5xI+jI0l3tqcnXKv6KZKICwAthKGzBM2 Mzini11QrT6XRWR17H/dp6vrIpFZ3oyaTP5uJozocpivt7u8gl+vGSrHAKq0Eh6DnjiD uLIotPEYGSosMoHsZ8QYuPx2DI78qGkk8tOZMDcrV6ntKREL2n2ju0m4ET69WF7A125T NolDiG/T8db+kLiGkgkVhuWhpIFyb9CxH6eE2E16LPPEyQhu4MQgxoZipQf0TOGSd9HT khKI1T7H6CGLvcZ4i0odpOSIuIZabGoV/bfXQsbjhMrWDt6cHri8wWYxEdJvaIzRBiZE x5Pw== X-Forwarded-Encrypted: i=1; AJvYcCX1LBmnfTesphoxCMKwvWdVq86L4nzeorcPXssgPY4Ev9WyhX6vBBTImUQxReFcmX1V6RlmbrsBEkZIH5RHz2nR+08Ja/7RDKIjYDbp X-Gm-Message-State: AOJu0Yzk2v8CdH2OE+Q9k31RZEc1/MMEgUeQiQ/MtqoMaaF8rvQWNnkE xzthf7UQV/w4w3uGNeqYZrCQSYwt5IF4KM+v+CW8bPuHawmv2GsZIXzwywO6UEg= X-Google-Smtp-Source: AGHT+IETNjFLF3X+Ku5v+Xs/f3tk1jQTaxypjSebgt5O2xuGJvzOB8jqRXYV5pbnShahTZbeDUMiWA== X-Received: by 2002:a05:6602:4a86:b0:7da:1885:50b5 with SMTP id ej6-20020a0566024a8600b007da188550b5mr378319iob.9.1713473263316; Thu, 18 Apr 2024 13:47:43 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id r6-20020a056638300600b00484948cb8f5sm626998jak.91.2024.04.18.13.47.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 13:47:42 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: mka@chromium.org, andersson@kernel.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 6/8] net: ipa: fix two bogus argument names Date: Thu, 18 Apr 2024 15:47:27 -0500 Message-Id: <20240418204729.1952353-7-elder@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240418204729.1952353-1-elder@linaro.org> References: <20240418204729.1952353-1-elder@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In "ipa_endpoint.h", two function declarations have bogus argument names. Fix these. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_endpoint.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ipa/ipa_endpoint.h b/drivers/net/ipa/ipa_endpoint.h index 3ad2e802040aa..b431e4e462114 100644 --- a/drivers/net/ipa/ipa_endpoint.h +++ b/drivers/net/ipa/ipa_endpoint.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ =20 /* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. - * Copyright (C) 2019-2023 Linaro Ltd. + * Copyright (C) 2019-2024 Linaro Ltd. */ #ifndef _IPA_ENDPOINT_H_ #define _IPA_ENDPOINT_H_ @@ -199,9 +199,9 @@ int ipa_endpoint_init(struct ipa *ipa, u32 count, const struct ipa_gsi_endpoint_data *data); void ipa_endpoint_exit(struct ipa *ipa); =20 -void ipa_endpoint_trans_complete(struct ipa_endpoint *ipa, +void ipa_endpoint_trans_complete(struct ipa_endpoint *endpoint, struct gsi_trans *trans); -void ipa_endpoint_trans_release(struct ipa_endpoint *ipa, +void ipa_endpoint_trans_release(struct ipa_endpoint *endpoint, struct gsi_trans *trans); =20 #endif /* _IPA_ENDPOINT_H_ */ --=20 2.40.1 From nobody Fri Feb 13 17:30:46 2026 Received: from mail-oa1-f41.google.com (mail-oa1-f41.google.com [209.85.160.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6FE151A0AFA for ; Thu, 18 Apr 2024 20:47:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473266; cv=none; b=AjaQxS93/Un/6CnoeJglriBpc4KIrUHxhZVXcLjqlRSnIDezvty/23uaDRqkXe6Ya5KS/oGzeuaOscVH+p8rInX0ghkHEiTDGfro2HbPFFHKlvGrIr6fCBKOhjafp+s3jm/SgJggf2i9thgNeCieMRKcj/h+WWTTIj5HDvFM1MU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473266; c=relaxed/simple; bh=EM+PQeT/+Ayv+DqVTXJ6eeqpjOeHpKwRxGVuenJZOr8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PkQ88QCxOElPq3z/gURQTcBtAcDrd7Vib9aTXb1KkZkRprph/t36uNx8iKlCMQTo6gdWEy4QI5apRlt3+XbPxkLK0UvRH+LxnUQJ5WgP+Z5dVux+AeRYHfY2VxpRuOPMKXtv2jIVH6nLE0fXzhSvvhwtojRFdZl1sz5Q3ZcmO8w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=V7ImgRe7; arc=none smtp.client-ip=209.85.160.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="V7ImgRe7" Received: by mail-oa1-f41.google.com with SMTP id 586e51a60fabf-22edcfcd187so489434fac.2 for ; Thu, 18 Apr 2024 13:47:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713473264; x=1714078064; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NOsLWHf1aG7QjlwAYhzu9K+FfSOj8nw2eYMqyFikvmc=; b=V7ImgRe7jkpHOts93G+lm8ZfO9vtJki+bHJ0OYnS501S6N72QFl2VAqL0oZk92QG3q m02rMzaHK9lln9LRB+LTNpKjMZM8eEUfyD2J1i88LyKH7kHzLT25MnE9nQFjXSSa0nNA LZCG0xLUPXsSPUL7eoiKlZgCVixeEm3fhiN/bh+NLnpt4pdDafK0fLfYLL0RSWF9ZqPN Tt2ff0T86NtzDvaqQ3/zBxJpzMMar+O82fDKHWqoBt3Ak9Odhwa0bcnlHrzZSbNbBHWH WrtxPOv+FVFLhMoupMyksg6vgMYsANQq0WHtaV62EczENhL4tIsGr+Tu4JF1S1Hg7+ji dq9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713473264; x=1714078064; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NOsLWHf1aG7QjlwAYhzu9K+FfSOj8nw2eYMqyFikvmc=; b=oKT2QfRNKt5RYaM5vN8VQI7l5OTy89XTS2SErCim6t10YqxcAwYeCCkwv/A6EpH0u6 Xrn6TnK3ECF5wOkPoQ5eH0Sz4rIyIRia1J6QcayVpfWIhCee7qbbT2GQam42hfX9hvwI EwZq96iYeh0SoflzMnONILommPipMcNX18UIUvLshyLdFB/Q81pHiBL6z0QhVFehe5TV yJhxt4f16R1+o8QcbDvDI22kmtpeyhQK6//T1ybD3nPaUQvEaswKygAFenNe50xhw6Z4 tLH11IYZyFRXNeb/ztp+FPAlfcEe9GLMdsxLjq2qHDFdkoBhi0E6mexiMHU5oe4E2fc4 el0A== X-Forwarded-Encrypted: i=1; AJvYcCWdXCbLoo+ebHL1xF0JN6svURRZiKISmjcgbbABe6T1HqSqGm/EqBgj6bThlC3zUXT27X3IFjAZYwexfND7mJTykVSoJN3FxTA3zqn6 X-Gm-Message-State: AOJu0Yyp4FiYMlbFXSI1OSeN6er1YcK+KlBlHq74PFZurj4ZQIn2zQGr 3Qg/wS0Oq6RmvEqeulsbkS9+qH0tkQRbGL+Eq7sP/x1a2hJ/flhQ2ngAa6JlGsE= X-Google-Smtp-Source: AGHT+IHgblJ9h1CLqLo4U6C2hS5Ih8NHrIzQTKnvXZ8o0ZznahnKl3ojygI4TwopwZYSah+zGVzmBw== X-Received: by 2002:a05:6870:d886:b0:22e:e1e5:b8d with SMTP id oe6-20020a056870d88600b0022ee1e50b8dmr240440oac.51.1713473264566; Thu, 18 Apr 2024 13:47:44 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id r6-20020a056638300600b00484948cb8f5sm626998jak.91.2024.04.18.13.47.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 13:47:44 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: mka@chromium.org, andersson@kernel.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 7/8] net: ipa: fix two minor ipa_cmd problems Date: Thu, 18 Apr 2024 15:47:28 -0500 Message-Id: <20240418204729.1952353-8-elder@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240418204729.1952353-1-elder@linaro.org> References: <20240418204729.1952353-1-elder@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In "ipa_cmd.h", ipa_cmd_data_valid() is declared, but that function does not exist. So delete that declaration. Also, for some reason ipa_cmd_init() never gets called. It isn't really critical--it just validates that some memory offsets and a size can be represented in some register fields, and they won't fail with current data. Regardless, call the function in ipa_probe(). Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_cmd.h | 8 -------- drivers/net/ipa/ipa_main.c | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/net/ipa/ipa_cmd.h b/drivers/net/ipa/ipa_cmd.h index e2cf1c2b0ef24..100a4e1133b5e 100644 --- a/drivers/net/ipa/ipa_cmd.h +++ b/drivers/net/ipa/ipa_cmd.h @@ -57,14 +57,6 @@ enum ipa_cmd_opcode { bool ipa_cmd_table_init_valid(struct ipa *ipa, const struct ipa_mem *mem, bool route); =20 -/** - * ipa_cmd_data_valid() - Validate command-realted configuration is valid - * @ipa: - IPA pointer - * - * Return: true if assumptions required for command are valid - */ -bool ipa_cmd_data_valid(struct ipa *ipa); - /** * ipa_cmd_pool_init() - initialize command channel pools * @channel: AP->IPA command TX GSI channel pointer diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c index 59e7abb4a0d19..04dc0540ff7fb 100644 --- a/drivers/net/ipa/ipa_main.c +++ b/drivers/net/ipa/ipa_main.c @@ -866,6 +866,10 @@ static int ipa_probe(struct platform_device *pdev) if (ret) goto err_reg_exit; =20 + ret =3D ipa_cmd_init(ipa); + if (ret) + goto err_mem_exit; + ret =3D gsi_init(&ipa->gsi, pdev, ipa->version, data->endpoint_count, data->endpoint_data); if (ret) --=20 2.40.1 From nobody Fri Feb 13 17:30:46 2026 Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4D361A38C7 for ; Thu, 18 Apr 2024 20:47:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473268; cv=none; b=nr6HEZKaJch5lp0DV8eEmgPubxv5dbrtDHOkd93TC0baHwc24VQvlIaIy9EIRB1tkPaIJ4yyleZ70p1hYNdnl8HK7ubiRQBx1nk3SW+cyLKNeLdsNFYuPPKjDSUjyHqWLpP8ygeGOsbTa49cPHqFz3y3u5G/bZYAPNqCC68AdmE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713473268; c=relaxed/simple; bh=P1dc1JdSs8SCHe62moGR5pSmeoHdNRxNzu0oI8BnvGo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tj3AqgEYKFiQ1oJEI7dBrAmTPB6eHREC22tM1c3cgSlUREYuKAuMM9caXcUgBE9t/GNyMwAFMXvOnUW6zVMM5KHKlMHxQ20Q0UsRHLat7kfZcIlyWb/HqaFsC7lAnsPkkxUjS8lvLoJyMT3u7sxRMfFUD/V/iF4PfYTKcIHoU44= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=oc3ASbev; arc=none smtp.client-ip=209.85.166.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="oc3ASbev" Received: by mail-il1-f181.google.com with SMTP id e9e14a558f8ab-36b04b101b0so5051245ab.1 for ; Thu, 18 Apr 2024 13:47:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713473266; x=1714078066; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iKHcTSaA5S2jqYA/kqtWjCsThpLVi1n0vQMddOFHVfU=; b=oc3ASbevYkdVqld9rh52QgXpyn232nnKU0kqzb2+xNesGHeym/dAMg8WYIYs3MAN4q hCvRryK38paWF3fDX0vlG9KhO5dGjORoT0JBIPM4FdPlDWQ9Ups+VZt/D+utC16yRKB7 O+99lMHdUyFpNstdA4ZlzbEkRPbZzP+wBu+Hn6Kv/93bvyL7/QNtcS6P6qNgwcf1HQsE NcxZ0FDTRD6Qx6Z2gHSquf19CEcgSzqhWsn9UhhxH+XNPe7B+qZl9UBbsJCmUQ/aqUrR kRPCWT+anA1nnJwttW4zRppdZ/5CTaHDQAL83Zqru2MDMMc0ieRMK0FNTB3Cbt9U+mjt tdAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713473266; x=1714078066; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iKHcTSaA5S2jqYA/kqtWjCsThpLVi1n0vQMddOFHVfU=; b=wMFSPLqXslLBUIOBJvTNtn14OtmoEzNalY3gkluJcMNiw26IcM2HzkUhukKRYNfI5l ieg8o9R2B1OS+GHyy7ON+GR7dB/mcKr2S5fZUeZJnNDBaDRUcbfgpzGpzw9v5Km/ngdG eY9rrRLmDM8m8uUhtmty/9f8dqZE0eCuQDGzz39pObZlI+t8dP9sLjjoNqsrh8pHhVJY mScX6cJ7NuJ8WQMwHPEWZNXjuhKDlm+twSySQT+pE8yHwoDkEGMbjq5VDTMNp+yGR1y8 6wCE5BNZRDTM4uB1i5BIdsTg3P6UzAzG8puLdo1HpTFCSVO+IPEFeUdHA27YC9rFfCqo ntJg== X-Forwarded-Encrypted: i=1; AJvYcCVG9eRomtoIEk2CPishqjN7jZJURuIqwcZi31Ld3hDIl+DiTHg2YiJ24lZaEzK1B+s970nKlt6eEGuanEykLYlrWhroKNJVmHnPwQh1 X-Gm-Message-State: AOJu0Ywf07xRLh41uFA/hBHn0rXheHKWTqTbiCWYXkGJqxCnRpY/KGe6 N1BGSvR7id21I7mqES5jONuWIiJXG5MKRpIUNH7Loa9sA/H96i+l1siJjFeHOjOIk/q1FZXOgDL 9 X-Google-Smtp-Source: AGHT+IEBmjMeQWQ1C1xMXu/cVMj/XUA9qRCtQq3gRTTd6N+Ui+CHA1A/6ETWP2Hc8qGzhlX60JhUcQ== X-Received: by 2002:a05:6e02:13aa:b0:36b:2b56:12 with SMTP id h10-20020a056e0213aa00b0036b2b560012mr379844ilo.7.1713473265848; Thu, 18 Apr 2024 13:47:45 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id r6-20020a056638300600b00484948cb8f5sm626998jak.91.2024.04.18.13.47.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 13:47:45 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: mka@chromium.org, andersson@kernel.org, quic_cpratapa@quicinc.com, quic_avuyyuru@quicinc.com, quic_jponduru@quicinc.com, quic_subashab@quicinc.com, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 8/8] net: ipa: kill ipa_version_supported() Date: Thu, 18 Apr 2024 15:47:29 -0500 Message-Id: <20240418204729.1952353-9-elder@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240418204729.1952353-1-elder@linaro.org> References: <20240418204729.1952353-1-elder@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The only place ipa_version_supported() is called is in the probe function. The version comes from the match data. Rather than checking the version validity separately, just consider anything that has match data to be supported. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_main.c | 5 ----- drivers/net/ipa/ipa_version.h | 18 ------------------ 2 files changed, 23 deletions(-) diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c index 04dc0540ff7fb..08ec3581d1d27 100644 --- a/drivers/net/ipa/ipa_main.c +++ b/drivers/net/ipa/ipa_main.c @@ -811,11 +811,6 @@ static int ipa_probe(struct platform_device *pdev) return -ENODEV; } =20 - if (!ipa_version_supported(data->version)) { - dev_err(dev, "unsupported IPA version %u\n", data->version); - return -EINVAL; - } - if (!data->modem_route_count) { dev_err(dev, "modem_route_count cannot be zero\n"); return -EINVAL; diff --git a/drivers/net/ipa/ipa_version.h b/drivers/net/ipa/ipa_version.h index 38150345b607e..ae3396314acaf 100644 --- a/drivers/net/ipa/ipa_version.h +++ b/drivers/net/ipa/ipa_version.h @@ -45,24 +45,6 @@ enum ipa_version { IPA_VERSION_COUNT, /* Last; not a version */ }; =20 -static inline bool ipa_version_supported(enum ipa_version version) -{ - switch (version) { - case IPA_VERSION_3_1: - case IPA_VERSION_3_5_1: - case IPA_VERSION_4_2: - case IPA_VERSION_4_5: - case IPA_VERSION_4_7: - case IPA_VERSION_4_9: - case IPA_VERSION_4_11: - case IPA_VERSION_5_0: - case IPA_VERSION_5_5: - return true; - default: - return false; - } -} - /* Execution environment IDs */ enum gsi_ee_id { GSI_EE_AP =3D 0x0, --=20 2.40.1