Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   <Prasurjya.Rohansaikia@microchip.com>
To:     <linux-wireless@vger.kernel.org>
CC:     <Ajay.Kathat@microchip.com>, <Claudiu.Beznea@microchip.com>
Subject: [PATCH] wifi: wilc1000: remove use of has_thrpt_enh3 flag
Thread-Topic: [PATCH] wifi: wilc1000: remove use of has_thrpt_enh3 flag
Thread-Index: AQHZsxMPwXszMpuH1EGsdQmB8pBnWQ==
Date:   Mon, 10 Jul 2023 09:44:03 +0000
Message-ID: <20230710094401.235222-1-prasurjya.rohansaikia@microchip.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?9kwlH/o7qMspfHIe4ipuOnXkGqNXecP9zWee9zVo16eGYh/J1x4zgm4vEG?=
 =?iso-8859-1?Q?63Ahk2HfD2Pv0qUst3ch4Y9NjaS6AUZMe9mjthiEL83cQ/yYKbskqECbEl?=
 =?iso-8859-1?Q?VxHpC3Lnwa4QxEygmLoo0wjbVRUa+XDAEOStFXUN0P8dOBVOzf8Bf8i4/w?=
 =?iso-8859-1?Q?3SgBToRkENgYWicXnQ7kXRL1CVrUzUyi825cVWtU55TvtsRkjkuuf4WvBc?=
 =?iso-8859-1?Q?9gFujloTIRehAd29S1DgrPJ5YZRbpaMGHjzJbzEtrPg6iS5g9B8zOZktoD?=
 =?iso-8859-1?Q?kheCy4+tMUd2daZ36W/5/WMnraKaVAIRjkWzrllAtWdjzi6aGJGsnoaoqC?=
 =?iso-8859-1?Q?oFQxplwtKgu2lQ6D36lvtgPKLfNOgQQ4ngM7Vzi/S5OMB5XO7fpjssDy7A?=
 =?iso-8859-1?Q?ljpWqKlSSugl+7NGT80mDvdWt3IsPO6vmeeVl5x6+3EdgsThPjst/OD7a0?=
 =?iso-8859-1?Q?15C+pRZI0C7XghLa/FYH52c9rxL1cm6QVUl8icEdzkMuBd92i5CR//TIVI?=
 =?iso-8859-1?Q?zi6dB83oYJLiQn1W2sBYFBtRizep5smeITnuCSxAxcuZs+A8q6lC+B/+VT?=
 =?iso-8859-1?Q?uhU2FxVuuPYiNjtvJCw/odEZsNcXUZYEpKxBsQHuYlYuNsleiTZ64P0jvF?=
 =?iso-8859-1?Q?njJyNc7H6CPes+dKRdRwlBeZoGtUagnSTOaBIj6GB8JxaW4wM/EQJamS/v?=
 =?iso-8859-1?Q?CiW/GPCCDxP5m0IOHv6uY89vwnfu162ZsUsfqefx7b2jKbvDG7uY73nKVe?=
 =?iso-8859-1?Q?UvcRDS+ctVmFyqiwz8AvWrBT6NA4aTUKTFULFzxVy+F488i+K10GJn6jYm?=
 =?iso-8859-1?Q?+/i41h1oLPcgI+CyWTI3ZTRKKdnQFcBj3qtog/YOPReHuBZ6kwijuKhE4J?=
 =?iso-8859-1?Q?dtqq5K2v9jMRmphX0n5KpMD4PLcV0d9cgcdq4iKBxgK2hTC7EYGZtXBYne?=
 =?iso-8859-1?Q?ptX4z2onpD9Kqg0XBm3duler6jIfUX495CQ7XNVR2Uo6v8ilHu262iekFC?=
 =?iso-8859-1?Q?PBzZ1EmnQKc/Tv/3fSsYcx7xI2/906NzOD8IawQ92gfuOPJ5Rqd6OqlgvM?=
 =?iso-8859-1?Q?9prPbpJSKsGOOn0wrZbNyNwhwqBF/+jA1Lkl+Fv68uiVJjC3WsSEV0nPJY?=
 =?iso-8859-1?Q?405Oq/9B4pdB/xhJcpEKyvhqOvpUHZLOtSObLlGqUfDjSYkvR9H6yH5dB5?=
 =?iso-8859-1?Q?AKNEBnFFFSWcm22t1QHsN8tuCK0sMk+PjN98dNAib+OrHY3ok8MfH4BQ11?=
 =?iso-8859-1?Q?d/LCXE+TWHCs4dOJrfpoq3/w+IiBrkK3irNgn/wipultYepWKQtQfHcOzk?=
 =?iso-8859-1?Q?B2+mPo49sS0F5UjeEiUhGZHL8MCW+iPj1xLh3tzmQwkQjVHkyZdu2unDY2?=
 =?iso-8859-1?Q?Bulu7hJXxh06CgMhEBlrvlHBJ8ywH8G+s7/r0lDNBOB/46vDXoJXn9ANli?=
 =?iso-8859-1?Q?+RKi8aJ9EPHHHWWgEmsMP+iQ+tuFN7bh76/PocfEzVvxtnx/UtKHc7QWdv?=
 =?iso-8859-1?Q?m03I/kdaTgwLt/8pjVsTNg3nqdQbVWBkaU+E/v38DAabTwFa0gujcc0FHR?=
 =?iso-8859-1?Q?RZV+A1CLo+Ia8Ilz4nk5/uLAIPQ/Sc7gtG9Wu5NCMakNkXyoRUel6JUzMK?=
 =?iso-8859-1?Q?46h2lhRSIttrB7wb2tNSOR68298gamth/dqj+WR5NIGuHoj+CDbRsYNeNj?=
 =?iso-8859-1?Q?vaole0Rzu7AjSoBVcBJ7APTZFxv3IGXyIvnXiod+?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB6336.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 67fe7234-d1ab-4b16-4b56-08db812a327a
X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jul 2023 09:44:03.8080
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3f4057f3-b418-4d4e-ba84-d55b4e897d88
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: XQnIUxYKmdRhduByfcatJRF1+UFQcpP22HVHd5wdCj9cIRc1T1ly7Jf20eQuBfPIoHAsepv896uYwFTE8LwYY1WQkEygMUWYVJOmM10AyKQ1mZXaQtIX60zOA6amXjdG
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR11MB6012
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE 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: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org

From: Prasurjya Rohan Saikia <prasurjya.rohansaikia@microchip.com>

The 'enhance throughput flow' algorithm is used by default. So older
sections of the code are removed so as to always use this new algorithm.

Signed-off-by: Prasurjya Rohan Saikia <prasurjya.rohansaikia@microchip.com>
---
 .../net/wireless/microchip/wilc1000/sdio.c    | 103 ++----------------
 1 file changed, 10 insertions(+), 93 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/sdio.c b/drivers/net/w=
ireless/microchip/wilc1000/sdio.c
index a05bda7b9a3b..87948ba69a22 100644
--- a/drivers/net/wireless/microchip/wilc1000/sdio.c
+++ b/drivers/net/wireless/microchip/wilc1000/sdio.c
@@ -28,7 +28,6 @@ struct wilc_sdio {
 	bool irq_gpio;
 	u32 block_size;
 	bool isinit;
-	int has_thrpt_enh3;
 	u8 *cmd53_buf;
 };
=20
@@ -722,21 +721,12 @@ static int wilc_sdio_init(struct wilc *wilc, bool res=
ume)
 	 *      make sure can read back chip id correctly
 	 **/
 	if (!resume) {
-		int rev;
-
 		ret =3D wilc_sdio_read_reg(wilc, WILC_CHIPID, &chipid);
 		if (ret) {
 			dev_err(&func->dev, "Fail cmd read chip id...\n");
 			return ret;
 		}
 		dev_err(&func->dev, "chipid (%08x)\n", chipid);
-		rev =3D FIELD_GET(WILC_CHIP_REV_FIELD, chipid);
-		if (rev > FIELD_GET(WILC_CHIP_REV_FIELD, WILC_1000_BASE_ID_2A))
-			sdio_priv->has_thrpt_enh3 =3D 1;
-		else
-			sdio_priv->has_thrpt_enh3 =3D 0;
-		dev_info(&func->dev, "has_thrpt_enh3 =3D %d...\n",
-			 sdio_priv->has_thrpt_enh3);
 	}
=20
 	sdio_priv->isinit =3D true;
@@ -809,102 +799,29 @@ static int wilc_sdio_clear_int_ext(struct wilc *wilc=
, u32 val)
 	struct sdio_func *func =3D dev_to_sdio_func(wilc->dev);
 	struct wilc_sdio *sdio_priv =3D wilc->bus_data;
 	int ret;
-	int vmm_ctl;
-
-	if (sdio_priv->has_thrpt_enh3) {
-		u32 reg =3D 0;
-
-		if (sdio_priv->irq_gpio)
-			reg =3D val & (BIT(MAX_NUM_INT) - 1);
-
-		/* select VMM table 0 */
-		if (val & SEL_VMM_TBL0)
-			reg |=3D BIT(5);
-		/* select VMM table 1 */
-		if (val & SEL_VMM_TBL1)
-			reg |=3D BIT(6);
-		/* enable VMM */
-		if (val & EN_VMM)
-			reg |=3D BIT(7);
-		if (reg) {
-			struct sdio_cmd52 cmd;
-
-			cmd.read_write =3D 1;
-			cmd.function =3D 0;
-			cmd.raw =3D 0;
-			cmd.address =3D WILC_SDIO_IRQ_CLEAR_FLAG_REG;
-			cmd.data =3D reg;
-
-			ret =3D wilc_sdio_cmd52(wilc, &cmd);
-			if (ret) {
-				dev_err(&func->dev,
-					"Failed cmd52, set (%02x) data (%d) ...\n",
-					cmd.address, __LINE__);
-				return ret;
-			}
-		}
-		return 0;
-	}
-	if (sdio_priv->irq_gpio) {
-		/* has_thrpt_enh2 uses register 0xf8 to clear interrupts. */
-		/*
-		 * Cannot clear multiple interrupts.
-		 * Must clear each interrupt individually.
-		 */
-		u32 flags;
-		int i;
-
-		flags =3D val & (BIT(MAX_NUM_INT) - 1);
-		for (i =3D 0; i < NUM_INT_EXT && flags; i++) {
-			if (flags & BIT(i)) {
-				struct sdio_cmd52 cmd;
-
-				cmd.read_write =3D 1;
-				cmd.function =3D 0;
-				cmd.raw =3D 0;
-				cmd.address =3D WILC_SDIO_IRQ_CLEAR_FLAG_REG;
-				cmd.data =3D BIT(i);
-
-				ret =3D wilc_sdio_cmd52(wilc, &cmd);
-				if (ret) {
-					dev_err(&func->dev,
-						"Failed cmd52, set (%02x) data (%d) ...\n",
-						cmd.address, __LINE__);
-					return ret;
-				}
-				flags &=3D ~BIT(i);
-			}
-		}
+	u32 reg =3D 0;
=20
-		for (i =3D NUM_INT_EXT; i < MAX_NUM_INT && flags; i++) {
-			if (flags & BIT(i)) {
-				dev_err(&func->dev,
-					"Unexpected interrupt cleared %d...\n",
-					i);
-				flags &=3D ~BIT(i);
-			}
-		}
-	}
+	if (sdio_priv->irq_gpio)
+		reg =3D val & (BIT(MAX_NUM_INT) - 1);
=20
-	vmm_ctl =3D 0;
 	/* select VMM table 0 */
 	if (val & SEL_VMM_TBL0)
-		vmm_ctl |=3D BIT(0);
+		reg |=3D BIT(5);
 	/* select VMM table 1 */
 	if (val & SEL_VMM_TBL1)
-		vmm_ctl |=3D BIT(1);
+		reg |=3D BIT(6);
 	/* enable VMM */
 	if (val & EN_VMM)
-		vmm_ctl |=3D BIT(2);
-
-	if (vmm_ctl) {
+		reg |=3D BIT(7);
+	if (reg) {
 		struct sdio_cmd52 cmd;
=20
 		cmd.read_write =3D 1;
 		cmd.function =3D 0;
 		cmd.raw =3D 0;
-		cmd.address =3D WILC_SDIO_VMM_TBL_CTRL_REG;
-		cmd.data =3D vmm_ctl;
+		cmd.address =3D WILC_SDIO_IRQ_CLEAR_FLAG_REG;
+		cmd.data =3D reg;
+
 		ret =3D wilc_sdio_cmd52(wilc, &cmd);
 		if (ret) {
 			dev_err(&func->dev,
--=20
2.34.1