From nobody Sun Apr 19 02:34:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A20CC433EF for ; Thu, 7 Jul 2022 08:08:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235238AbiGGIIH (ORCPT ); Thu, 7 Jul 2022 04:08:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234655AbiGGIID (ORCPT ); Thu, 7 Jul 2022 04:08:03 -0400 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8A0B33E29 for ; Thu, 7 Jul 2022 01:08:02 -0700 (PDT) Received: by mail-pf1-x42d.google.com with SMTP id j3so5212685pfb.6 for ; Thu, 07 Jul 2022 01:08:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MO3ynSxTj8X1iCfAoxAy28PWw6GICyf08YG7/5qtXxo=; b=PJ+ZhdDXDLbL0KK1RiKOurk0CvAhFVF5mBp/VCAST7ahanMw8eIp5Bzpjk3oKcvJiO J0qspqCUt1HpVmVXfRtifYWZyVpVqEwTtG0lqcvVxcEDZFA7/FzhNXIxZgGnNmHI8NdZ pBUYRfrd0OZLpgNUYGy59RmWrlyUODCb6y26Dx/OylIZQawfKSnrCo8kQJwOtuIdkPgV P5c38HarwZL1OYa1I0eprUzp4mmcX2HPL5G2n0Kk3XeOe5vskaqy8V7zYoyYo7XZWWho Ez2bs1VLcPFGJi8h34ZKrysLJFnXBSX1UBwFSzGpKeHh/I3kDKNl09l/WW9STD/xJv20 1CVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MO3ynSxTj8X1iCfAoxAy28PWw6GICyf08YG7/5qtXxo=; b=l0YjID6RCwjJhpbjtWrvEKxv8P5Se7KTJtMl0zRSzDDqzUr1kKDTurE2sLVez8Lenk ueittgImEW3TIj1Atl5lCoOngril9YLGHWGCXZtIObT31TiFb1I8BpbJhlyd/Bh+FN2M QaOxJauOGSk9XH2M6mFUQskOFY/aZBCS1kRgahAasiha4m/vLttwuWkwJjd6bMHKtYXz puLXvDmnrIg4vfo44ipOnETtOiGeETANdxRXmOeMY7eURw2/jbMOxZ92MjfgghqHKslC BWYMNXF902E2l1Y9E5xKrTYo+zDoCEuSxyKIh9JRWZJZAnmH1tpB8ZqzJEshyNgMbX+b Mz9g== X-Gm-Message-State: AJIora/iVU5IpEDyCGxerJkJ0BjqmmCM4D6Dqk4fMOW09z1rLOzeKtzO fFh9KtDsK/nmkjl22K//YQ0= X-Google-Smtp-Source: AGRyM1vNn3jmyFY6iNR9bfGT2tzhmnOtKbimC0i10Ah6N47O9NBIDTvg6GpILMBbxDE7K7U1ewfGMg== X-Received: by 2002:a17:902:6b8b:b0:14d:66c4:f704 with SMTP id p11-20020a1709026b8b00b0014d66c4f704mr52158092plk.53.1657181282389; Thu, 07 Jul 2022 01:08:02 -0700 (PDT) Received: from octofox.hsd1.ca.comcast.net ([2601:641:401:1d20:a3e3:ea8c:2267:a237]) by smtp.gmail.com with ESMTPSA id p4-20020a170902e74400b0016c0c82e85csm1377374plf.75.2022.07.07.01.08.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 01:08:02 -0700 (PDT) From: Max Filippov To: linux-xtensa@linux-xtensa.org Cc: Chris Zankel , linux-kernel@vger.kernel.org, Yang Yingliang , Max Filippov Subject: [PATCH 1/3] xtensa: iss/network: drop 'devices' list Date: Thu, 7 Jul 2022 01:07:59 -0700 Message-Id: <20220707080801.3496148-2-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220707080801.3496148-1-jcmvbkbc@gmail.com> References: <20220707080801.3496148-1-jcmvbkbc@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" There are two per-device lists in the ISS network driver: command line parameters list and iss_net_private object list. The latter is only used for duplicate checking in the function iss_net_setup where the former should have been used. Drop iss_net_private object list and associated code and use command line parameters list in the iss_net_setup instead. Signed-off-by: Max Filippov --- arch/xtensa/platforms/iss/network.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/is= s/network.c index fd84d4891758..2d566231688f 100644 --- a/arch/xtensa/platforms/iss/network.c +++ b/arch/xtensa/platforms/iss/network.c @@ -37,10 +37,6 @@ #define ETH_HEADER_OTHER 14 #define ISS_NET_TIMER_VALUE (HZ / 10) =20 - -static DEFINE_SPINLOCK(devices_lock); -static LIST_HEAD(devices); - /* -----------------------------------------------------------------------= -- */ =20 /* We currently only support the TUNTAP transport protocol. */ @@ -70,8 +66,6 @@ struct iss_net_ops { /* This structure contains out private information for the driver. */ =20 struct iss_net_private { - struct list_head device_list; - spinlock_t lock; struct net_device *dev; struct platform_device pdev; @@ -488,7 +482,6 @@ static int iss_net_configure(int index, char *init) =20 lp =3D netdev_priv(dev); *lp =3D (struct iss_net_private) { - .device_list =3D LIST_HEAD_INIT(lp->device_list), .dev =3D dev, .index =3D index, }; @@ -521,10 +514,6 @@ static int iss_net_configure(int index, char *init) driver_registered =3D 1; } =20 - spin_lock(&devices_lock); - list_add(&lp->device_list, &devices); - spin_unlock(&devices_lock); - lp->pdev.id =3D index; lp->pdev.name =3D DRIVER_NAME; platform_device_register(&lp->pdev); @@ -574,7 +563,7 @@ struct iss_net_init { =20 static int __init iss_net_setup(char *str) { - struct iss_net_private *device =3D NULL; + struct iss_net_init *device =3D NULL; struct iss_net_init *new; struct list_head *ele; char *end; @@ -595,16 +584,12 @@ static int __init iss_net_setup(char *str) } str =3D end; =20 - spin_lock(&devices_lock); - - list_for_each(ele, &devices) { - device =3D list_entry(ele, struct iss_net_private, device_list); + list_for_each(ele, ð_cmd_line) { + device =3D list_entry(ele, struct iss_net_init, list); if (device->index =3D=3D n) break; } =20 - spin_unlock(&devices_lock); - if (device && device->index =3D=3D n) { pr_err("Device %u already configured\n", n); return 1; --=20 2.30.2 From nobody Sun Apr 19 02:34:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA165C43334 for ; Thu, 7 Jul 2022 08:08:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235246AbiGGIIM (ORCPT ); Thu, 7 Jul 2022 04:08:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235120AbiGGIIE (ORCPT ); Thu, 7 Jul 2022 04:08:04 -0400 Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B30F133E24 for ; Thu, 7 Jul 2022 01:08:03 -0700 (PDT) Received: by mail-pg1-x532.google.com with SMTP id o18so15926353pgu.9 for ; Thu, 07 Jul 2022 01:08:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2JMkXDEWsNUyTV2UFLqYbO8oSrxA6PJmtCKjhOjVVJ4=; b=nWYmo88lUUMdAAw/AyAA10vGHCXrzofBxrdXE1qJ963zAeRDuNtSuDr+VV8zmRubSq 9lUhLXxg/R4MjQ11mEQilzJuJU957zpgOqCfmn3PfrdcSeCw74kjSaKWfy4g8OM6/LL9 m+13SWwSSgiOVzEAvOch/Yr8Y5m6CyMbhf1ErWIE+EXTbEO0Z9Kw82BQQ1prM3ORrzUk VXsM4Aajba2dQA0Qav2OT3AnMxsW4zLEAfkWgRmWZEvxxioMH6pdmy++vMMk0cblfj3I Im5Gn3/9qc/1jZW+bedAApaLjpiXSJhCTcVf1JFt4aIg77Mb4E9SD8Ba098UnwN1i0VU 5v7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2JMkXDEWsNUyTV2UFLqYbO8oSrxA6PJmtCKjhOjVVJ4=; b=zWAgv8pzcuhHzWOOJcEjRPthjr2HFxkmoorWdAoNzWdV+w+b6jwn6wDcfS1JwYTUmv VglAXWreYLbe19AFH5jsU7eOep7a5pQjKQfzYahTeWk8InT/jPsgMs04HGahQqiI7tNi uOEUOcFZbxdh4pe0b0D9Htyh0FZpEbWksp8AHXxiIUz3Saysf/10W4B7WsXSH1KGkKji by74UEkoIPhFt+QjEpDppkbXvTs0kaCUH7iCEcGL2bgxUxSz/0MXY13+KxxbqdBsEATm uVUsD79d1EonYjhB8OVdDh0w7xRI2aSXaZtW9dmaOjCsQASqut9s3I0Vh3O14MNNRsah liPQ== X-Gm-Message-State: AJIora8tIdHgtwfj/4cuXXOCNfgZlbRZ5dL8nIGTQz/ZxQjPhsj0R4ym R63QbFUaiJNON5PykidL6yR5D+dF/X/l8g== X-Google-Smtp-Source: AGRyM1vAj9M28V9eEUa1ApSChnk2UKy2aafHz1z3Exu9j5+0/rqmJGtoPCJzhLb48Tq8hU5ivANbJw== X-Received: by 2002:a63:c006:0:b0:411:c33f:b4bb with SMTP id h6-20020a63c006000000b00411c33fb4bbmr31162443pgg.433.1657181283214; Thu, 07 Jul 2022 01:08:03 -0700 (PDT) Received: from octofox.hsd1.ca.comcast.net ([2601:641:401:1d20:a3e3:ea8c:2267:a237]) by smtp.gmail.com with ESMTPSA id p4-20020a170902e74400b0016c0c82e85csm1377374plf.75.2022.07.07.01.08.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 01:08:02 -0700 (PDT) From: Max Filippov To: linux-xtensa@linux-xtensa.org Cc: Chris Zankel , linux-kernel@vger.kernel.org, Yang Yingliang , Max Filippov Subject: [PATCH 2/3] xtensa: iss/network: provide release() callback Date: Thu, 7 Jul 2022 01:08:00 -0700 Message-Id: <20220707080801.3496148-3-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220707080801.3496148-1-jcmvbkbc@gmail.com> References: <20220707080801.3496148-1-jcmvbkbc@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Provide release() callback for the platform device embedded into struct iss_net_private and registered in the iss_net_configure so that platform_device_unregister could be called for it. Signed-off-by: Max Filippov --- arch/xtensa/platforms/iss/network.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/is= s/network.c index 2d566231688f..2a22e80a488d 100644 --- a/arch/xtensa/platforms/iss/network.c +++ b/arch/xtensa/platforms/iss/network.c @@ -466,6 +466,15 @@ static const struct net_device_ops iss_netdev_ops =3D { .ndo_set_rx_mode =3D iss_net_set_multicast_list, }; =20 +static void iss_net_pdev_release(struct device *dev) +{ + struct platform_device *pdev =3D to_platform_device(dev); + struct iss_net_private *lp =3D + container_of(pdev, struct iss_net_private, pdev); + + free_netdev(lp->dev); +} + static int iss_net_configure(int index, char *init) { struct net_device *dev; @@ -516,6 +525,7 @@ static int iss_net_configure(int index, char *init) =20 lp->pdev.id =3D index; lp->pdev.name =3D DRIVER_NAME; + lp->pdev.dev.release =3D iss_net_pdev_release; platform_device_register(&lp->pdev); SET_NETDEV_DEV(dev, &lp->pdev.dev); =20 --=20 2.30.2 From nobody Sun Apr 19 02:34:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D320C43334 for ; Thu, 7 Jul 2022 08:08:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235255AbiGGIIO (ORCPT ); Thu, 7 Jul 2022 04:08:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235225AbiGGIIF (ORCPT ); Thu, 7 Jul 2022 04:08:05 -0400 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A87C533E1D for ; Thu, 7 Jul 2022 01:08:04 -0700 (PDT) Received: by mail-pg1-x52c.google.com with SMTP id q82so9936246pgq.6 for ; Thu, 07 Jul 2022 01:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j6z46hiTjAFvo7B2XUi7zY5HtGJndA6IMLx4jpxUBEs=; b=bvUt6Y9q5nJpoMf/TkNjPflp+QVRATuQJM+2Uz7UJqp5EPiPO9hm1iPptdnP29Trgf GF8WQsnxlTuUGqBNzyeIrVmI5q9W6vwey6WxSeyrkaqn60+So2cU+4e08ECU+TrKbmXB 5USm+ODMNCXqVHy+ehQtT/1Qpj942xdwA2svdpclRz1B3embRd28Tk6pE/rlKQMOEtx5 jLNtHAz91agwo3TMpRDlobNcVwJm0b5wPOIQ/11YylkiN8qgEbpBHnwsH0MziF35SVc4 WS8fvK93/1WmrbX0ZJPqzX3hKzOKncxEvYWolJjp1eRxtfzR/tZMeBw8nZd4Oj82TPtw XBCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j6z46hiTjAFvo7B2XUi7zY5HtGJndA6IMLx4jpxUBEs=; b=sfF5dW9VlHC524GeB7dt8PccCR0iyOClGdmbZb+dxzkWpjKnklz9PvW2sh/fb94cDv YKWgld618K6LeS0VQyNlCyAK4bpEyw1+lXN5anlY6sa3hRe7qKoCfZW4SCgLXRR2mXP4 A+SZN9EjTOtcbKPTy8bj+iI9Ui8zOfJTqIAv6ZdHQHWk6aY81HPaPqzZoE7ZLda2U9xC z6XKaiZfrBR72jLZWvSGdPyoF0Cg9ZL3R7M2v5vRxZvDo5KvaNjwaFIycVbfLThlwR6y AtdjoKi1nSTPhSmSd+Q71ZGPRaP580dRsGZQRl39zwjBlPlpQAdArMtjtKqBgrike7bG u5MA== X-Gm-Message-State: AJIora9Zzqeeak/1yu3AMj42JOGDrx0BuyKKFrjMK28aoC3vKLDbq9tg ZqjZyCXCn/3w0SLAe2vTaZU= X-Google-Smtp-Source: AGRyM1u1nGKb6bqFtCjv2ok/Qdvnbqj9zUNGHWmEkUcEuoWp5InGOSIlHmtxCpK9b9bLC2iYubbJJw== X-Received: by 2002:a63:4343:0:b0:411:e30c:fad8 with SMTP id q64-20020a634343000000b00411e30cfad8mr28570543pga.278.1657181284242; Thu, 07 Jul 2022 01:08:04 -0700 (PDT) Received: from octofox.hsd1.ca.comcast.net ([2601:641:401:1d20:a3e3:ea8c:2267:a237]) by smtp.gmail.com with ESMTPSA id p4-20020a170902e74400b0016c0c82e85csm1377374plf.75.2022.07.07.01.08.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 01:08:03 -0700 (PDT) From: Max Filippov To: linux-xtensa@linux-xtensa.org Cc: Chris Zankel , linux-kernel@vger.kernel.org, Yang Yingliang , Hulk Robot , Max Filippov Subject: [PATCH v3 3/3] xtensa: iss: fix handling error cases in iss_net_configure() Date: Thu, 7 Jul 2022 01:08:01 -0700 Message-Id: <20220707080801.3496148-4-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220707080801.3496148-1-jcmvbkbc@gmail.com> References: <20220707080801.3496148-1-jcmvbkbc@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Yang Yingliang The 'pdev' and 'netdev' need to be released in error cases of iss_net_configure(). Change the return type of iss_net_configure() to void, because it's not used. Fixes: 7282bee78798 ("[PATCH] xtensa: Architecture support for Tensilica Xt= ensa Part 8") Reported-by: Hulk Robot Signed-off-by: Yang Yingliang Signed-off-by: Max Filippov --- Changes v2->v3: - drop err_unregister_device label and return after calling platform_device_unregister in case of register_netdevice failure Changes v1->v2: - change return type of iss_net_configure() to void arch/xtensa/platforms/iss/network.c | 32 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/is= s/network.c index 2a22e80a488d..9ac46ab3a296 100644 --- a/arch/xtensa/platforms/iss/network.c +++ b/arch/xtensa/platforms/iss/network.c @@ -475,16 +475,15 @@ static void iss_net_pdev_release(struct device *dev) free_netdev(lp->dev); } =20 -static int iss_net_configure(int index, char *init) +static void iss_net_configure(int index, char *init) { struct net_device *dev; struct iss_net_private *lp; - int err; =20 dev =3D alloc_etherdev(sizeof(*lp)); if (dev =3D=3D NULL) { pr_err("eth_configure: failed to allocate device\n"); - return 1; + return; } =20 /* Initialize private element. */ @@ -511,7 +510,7 @@ static int iss_net_configure(int index, char *init) if (!tuntap_probe(lp, index, init)) { pr_err("%s: invalid arguments. Skipping device!\n", dev->name); - goto errout; + goto err_free_netdev; } =20 pr_info("Netdevice %d (%pM)\n", index, dev->dev_addr); @@ -519,14 +518,16 @@ static int iss_net_configure(int index, char *init) /* sysfs register */ =20 if (!driver_registered) { - platform_driver_register(&iss_net_driver); + if (platform_driver_register(&iss_net_driver)) + goto err_free_netdev; driver_registered =3D 1; } =20 lp->pdev.id =3D index; lp->pdev.name =3D DRIVER_NAME; lp->pdev.dev.release =3D iss_net_pdev_release; - platform_device_register(&lp->pdev); + if (platform_device_register(&lp->pdev)) + goto err_free_netdev; SET_NETDEV_DEV(dev, &lp->pdev.dev); =20 dev->netdev_ops =3D &iss_netdev_ops; @@ -535,23 +536,20 @@ static int iss_net_configure(int index, char *init) dev->irq =3D -1; =20 rtnl_lock(); - err =3D register_netdevice(dev); - rtnl_unlock(); - - if (err) { + if (register_netdevice(dev)) { + rtnl_unlock(); pr_err("%s: error registering net device!\n", dev->name); - /* XXX: should we call ->remove() here? */ - free_netdev(dev); - return 1; + platform_device_unregister(&lp->pdev); + return; } + rtnl_unlock(); =20 timer_setup(&lp->tl, iss_net_user_timer_expire, 0); =20 - return 0; + return; =20 -errout: - /* FIXME: unregister; free, etc.. */ - return -EIO; +err_free_netdev: + free_netdev(dev); } =20 /* -----------------------------------------------------------------------= -- */ --=20 2.30.2