From patchwork Fri Nov 4 17:16:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Mailhol X-Patchwork-Id: 15711 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp535105wru; Fri, 4 Nov 2022 10:18:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4bYZc2/Eo4PW41otoo9xc+KebEZhgSHOJCMMvh5dIM0Z6mXme8Wis7PhzB5eeI5r64aXXg X-Received: by 2002:a17:902:e74f:b0:186:a962:8f92 with SMTP id p15-20020a170902e74f00b00186a9628f92mr37104620plf.41.1667582284997; Fri, 04 Nov 2022 10:18:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667582284; cv=none; d=google.com; s=arc-20160816; b=hSd+nr5+t4Zz3jfRjW0sy4ZYTVrNeVT40dBqNmpCDUDzztRgT2CBXIsxBisSD4cySc rS9RKe6UcgaTETYdjfAAPY/XdYljlUhQhCsR/Z+kCECuNl1Epk9JAQHyKIzI67fwYduI fSGSla4cRfH0sNk6LcUIv3qcXiyPxscdbeNmrs/UHwC+QxPIiQWx3hqUwl76zKAs2EXX so5YS1se1ix6Ck6mvHNettzIJXQOg0RPmVz/P+Z+xDR4AKD8UnKYL9AsiJ3PpHfdzCj7 G1iVwMoinL266C1jTfl+LS7xJIIsHw7/oHS97Xn2/zgu0GKGIxuCLz8RjnZ7P74CLqeF REpw== 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:sender :dkim-signature; bh=c6xstQC+oWBeL9AwJF0jL3DBXjH1eGPpeBG49uXCkMc=; b=JCMIFp+j94qyhbOgATjjxEcy3QCjaVR6qcVdif4MWoL+5f0KgVFsnwiaJ+DTypCkyf YwcqzIIhb3X1zr1qMetYA84ipVDyydHhJo/AAtDpx3b+WQM2O1knflE2fB9Hc4TgDUcZ Yg/NRHEO/fo1hilaeBJxqtc9/844Ly4DDF/GHfdhHu6KRwUoMTKgxHu6p0jaP2PEjV9O 56rdOUv9SkMSzlpiGOl/qM06PHWuRxKWdCy3nFTmdodIoSR8D/oYx2QTqTCPPOs/3bCa FfYdVHh+CE5MQ4eyANOdLRt3OdU9tYwYk2iszzwzxJuh86xpVd5fnGcLFaFFqYGKsQUH BZow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Ghil2qaj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s3-20020a632143000000b0043cb43f584fsi5375892pgm.482.2022.11.04.10.17.50; Fri, 04 Nov 2022 10:18:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Ghil2qaj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231743AbiKDRQx (ORCPT + 99 others); Fri, 4 Nov 2022 13:16:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231580AbiKDRQm (ORCPT ); Fri, 4 Nov 2022 13:16:42 -0400 Received: from mail-pg1-x536.google.com (mail-pg1-x536.google.com [IPv6:2607:f8b0:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4D253E0AF; Fri, 4 Nov 2022 10:16:39 -0700 (PDT) Received: by mail-pg1-x536.google.com with SMTP id v3so4910785pgh.4; Fri, 04 Nov 2022 10:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=c6xstQC+oWBeL9AwJF0jL3DBXjH1eGPpeBG49uXCkMc=; b=Ghil2qaj38t6smkETB1K9BXz0DmrVNVi9yXIXDoDSKDnadi3OpTbUWhA7SK69bzEwI DR13bjWvIrDDunwYvpDndcJqX7us7Kr1TeZeh1zQZ5aZgturlor6ik/JoKO21iKmjMCe xlUXwuCJwGXHUdW7ZiGS+Xtc9pjxejTiHp7Lhc7aarG4zyDLcgnzR3OO7WN6pn3H8O1s a9sVNJnXL7zLxoQUf72YMUa+TzZUF6KiE/UcuNuB0Kn7mRZ8taOImBLNBrDYCj53epsn hLuD39Mn1iMLo1eucyN7gX9AgKga2QLoLYEag4Pk7i24p3MglepXq9Dis1lmh5DxFRCb Y/vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=c6xstQC+oWBeL9AwJF0jL3DBXjH1eGPpeBG49uXCkMc=; b=FcdbP5DPviT+OcczJwUUiClLh8vz9FkZW+GRNCjzlDjo1rSfY/aF16oDDM8mDzhzUU OWhidvy+MjlYIXGASluGrLUjhe5sokJ+gJscPukd0M+5nR2aMVX0oUS3yOVjmyx2bKDF kHEzXz166j+ZfVHvOoNUPpoqH+7dWIXBe4lruSuVJ83OsXfPF7COVUpVEHzoPyVKN6RY FQUxqqtClcWXaxm4WGnEzvj/NpwcgBw3tSelpeFhp0afaPh3khZDAejQ6TiZM/mLrXO8 wxswWdY1T4O17h4GwM2GikWgpdo0a7LMd8QAIa5IwLDLn/JF4ZtoKh8spzSNigHCheQp ES2A== X-Gm-Message-State: ACrzQf310acscScZ/DOIQOvh7dGDv8eMq+W7jz+TG0KzVEgEBUqX6fRp Z4RxZausvr+ea0BN5mhAvvWPo1m5ISY= X-Received: by 2002:a63:1303:0:b0:46f:b44b:3519 with SMTP id i3-20020a631303000000b0046fb44b3519mr25169879pgl.278.1667582199111; Fri, 04 Nov 2022 10:16:39 -0700 (PDT) Received: from localhost.localdomain (124x33x176x97.ap124.ftth.ucom.ne.jp. [124.33.176.97]) by smtp.gmail.com with ESMTPSA id u15-20020a17090a450f00b00212c27abcaesm1917655pjg.17.2022.11.04.10.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 10:16:38 -0700 (PDT) Sender: Vincent Mailhol From: Vincent Mailhol To: linux-can@vger.kernel.org Cc: Marc Kleine-Budde , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Vincent Mailhol Subject: [PATCH v2 1/3] USB: core: export usb_cache_string() Date: Sat, 5 Nov 2022 02:16:02 +0900 Message-Id: <20221104171604.24052-2-mailhol.vincent@wanadoo.fr> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221104171604.24052-1-mailhol.vincent@wanadoo.fr> References: <20221104073659.414147-1-mailhol.vincent@wanadoo.fr> <20221104171604.24052-1-mailhol.vincent@wanadoo.fr> MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, SPF_PASS autolearn=no 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748586761916897891?= X-GMAIL-MSGID: =?utf-8?q?1748586761916897891?= usb_cache_string() can also be useful for the drivers so export it. Signed-off-by: Vincent Mailhol --- drivers/usb/core/message.c | 1 + drivers/usb/core/usb.h | 1 - include/linux/usb.h | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 4d59d927ae3e..127fac1af676 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -1037,6 +1037,7 @@ char *usb_cache_string(struct usb_device *udev, int index) } return smallbuf; } +EXPORT_SYMBOL_GPL(usb_cache_string); /* * usb_get_device_descriptor - (re)reads the device descriptor (usbcore) diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h index 82538daac8b8..0eac7d4285d1 100644 --- a/drivers/usb/core/usb.h +++ b/drivers/usb/core/usb.h @@ -47,7 +47,6 @@ extern int usb_get_device_descriptor(struct usb_device *dev, extern int usb_set_isoch_delay(struct usb_device *dev); extern int usb_get_bos_descriptor(struct usb_device *dev); extern void usb_release_bos_descriptor(struct usb_device *dev); -extern char *usb_cache_string(struct usb_device *udev, int index); extern int usb_set_configuration(struct usb_device *dev, int configuration); extern int usb_choose_configuration(struct usb_device *udev); extern int usb_generic_driver_probe(struct usb_device *udev); diff --git a/include/linux/usb.h b/include/linux/usb.h index 9ff1ad4dfad1..d2d2f41052c0 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -1829,6 +1829,7 @@ static inline int usb_get_ptm_status(struct usb_device *dev, void *data) extern int usb_string(struct usb_device *dev, int index, char *buf, size_t size); +extern char *usb_cache_string(struct usb_device *udev, int index); /* wrappers that also update important state inside usbcore */ extern int usb_clear_halt(struct usb_device *dev, int pipe); From patchwork Fri Nov 4 17:16:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Mailhol X-Patchwork-Id: 15710 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp534719wru; Fri, 4 Nov 2022 10:17:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Pc3s8POFeiYHgqnkUxMA3wHdw8hHM39PBtAMw+xN/sgWGhg69vzTikz7AmVErszx1n04V X-Received: by 2002:a17:90a:b904:b0:213:f5ec:3915 with SMTP id p4-20020a17090ab90400b00213f5ec3915mr24803568pjr.33.1667582245978; Fri, 04 Nov 2022 10:17:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667582245; cv=none; d=google.com; s=arc-20160816; b=xu4ABUx+07hYXLMsqaOjcmxmWRzwKw9KQLEOY+HwwExUtGGcALSDh/dvB5JGCJCLNm YWVPo71VSdjVh61PF7Ux1Mwzz9Q/uAlWZ87lZ69/Lnc+pAXMYetvxCnrtkRghWed7vCu AOMXZVl3LYW4XoLkN80cseuvK451h0LKP6/y0fOaIBvyfxpGuqJj7HDX8om1XPP27qpK mdc6mK1x3DccFuRsObdsTHljsoRm5Gwbo+hKCdlK2427B2uTQq4+3tFBpddVCngo4bGG b6ZPijlhhZFD+Dpn7RK0/xPS1tO0kJKpO4s1OJ3GcuJae95wclI5sgmUzToEQCRQQhmj Rybw== 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:sender :dkim-signature; bh=Xz0y0NUNkUf+PsJYRPU+aqv8faUzWDQk/DO9G90XRKo=; b=L6CaepHYZuZZeoHfQqSW7dBHoRHGIF8sqtxzEsv47nEyi4DUNneEMzzIWCJOEv4406 ThIGQ0vhCpqJvLs/BKi2BPnVQpmiPvjcPizhEYjv9cry7fMZv2F4vP9MF8578vIZ4uyY 3ch8YLcoQIZiJOiI4szaXVDZ6XxfjjVxQSCiMumuS6zMvkgdUuUDt3tknSaKAqfRet0g bMqy4jRqjBzHTnlPCaJlv4q+4GmV3qyoL4sRr9KaNyuNtQQp5rN9UL7CtOui7R3VGcDf KzNahx36/ioEkZrvYebqYPJOF9hSWb3iPFPN2GUTjRfmF2ZrgXbamf1+8j3/h/JQdE3z 5jbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Z3ID3+fU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a29-20020aa795bd000000b0056c231e4447si4966927pfk.198.2022.11.04.10.17.13; Fri, 04 Nov 2022 10:17:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Z3ID3+fU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231659AbiKDRQu (ORCPT + 99 others); Fri, 4 Nov 2022 13:16:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231539AbiKDRQo (ORCPT ); Fri, 4 Nov 2022 13:16:44 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D52B32BA7; Fri, 4 Nov 2022 10:16:42 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id z26so5082329pff.1; Fri, 04 Nov 2022 10:16:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=Xz0y0NUNkUf+PsJYRPU+aqv8faUzWDQk/DO9G90XRKo=; b=Z3ID3+fUilwpptQbakP1Bw3RkXXb6Z6uBwK9oPN9nqBEAh1/6XDg03a6BlcSasoJh9 gYa4XkYDTSIm4NCKqnkv41e7VwaffKXipVy4PsCcn+xtKt4XM8yg0TSG8/JkUaio/0ND ldix8oj7sZQDc3y7Z8qdwu92XziPcWSMdfJWwmadqK3F0ngSiAAOgXGoaPhh41RW8W8y xyete8ujLnU9jve0QgEtnHjRoEfDnLBv3BBDB0dAyBOwDkNWs+q27BbHYc1rb2HJ8Epd 3+8yHxzdRRwsLZjt6DJWoL0BVuTj7zSU0P6Z/8GkXSjUVTxfbmgDuouyKPpHVtMw5vqg lrkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Xz0y0NUNkUf+PsJYRPU+aqv8faUzWDQk/DO9G90XRKo=; b=uP1bi2Eptrr7q0NS8zMrrQDJeAuyAEsbqeN7w/Az0XNFQFNvQP/g+qYFgFaZIACYyF w1l0+F9S6sXaiP6x/ch658gLtLUwKqS1tkYOdny/Y8rRxXT4F3KcCkaziegb0/SnQyOq /yko1escrKAP1rV/rSWGikpQAZU+Zfo/cXJy5sG650DO4ekXLzDMqg25pXyn79w8lP9v URz1dEpfWDLHZK9VYuRr6Oo8PCnKjR0oZBQQYTOepKeGJO6W39hnkX9uiUloCCknJef5 mWjn2kGVsBcSrcTVzqGuCO9FIimBdRiTCFngkGKA71nRQpWQ4IXTa4OToMbSyj+X78/h sWHg== X-Gm-Message-State: ACrzQf3N4eWcq158xXthjP4rgW52/Ukeos3TC6n5TVFXhVRXpZHqt+70 bZwWbpbNJ6zWDTVAgaHKKuTXrSm1Ijw= X-Received: by 2002:a63:e348:0:b0:46f:25cc:d554 with SMTP id o8-20020a63e348000000b0046f25ccd554mr32095610pgj.598.1667582201901; Fri, 04 Nov 2022 10:16:41 -0700 (PDT) Received: from localhost.localdomain (124x33x176x97.ap124.ftth.ucom.ne.jp. [124.33.176.97]) by smtp.gmail.com with ESMTPSA id u15-20020a17090a450f00b00212c27abcaesm1917655pjg.17.2022.11.04.10.16.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 10:16:41 -0700 (PDT) Sender: Vincent Mailhol From: Vincent Mailhol To: linux-can@vger.kernel.org Cc: Marc Kleine-Budde , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Vincent Mailhol Subject: [PATCH v2 2/3] can: etas_es58x: use usb_cache_string() to retrieve the product info string Date: Sat, 5 Nov 2022 02:16:03 +0900 Message-Id: <20221104171604.24052-3-mailhol.vincent@wanadoo.fr> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221104171604.24052-1-mailhol.vincent@wanadoo.fr> References: <20221104073659.414147-1-mailhol.vincent@wanadoo.fr> <20221104171604.24052-1-mailhol.vincent@wanadoo.fr> MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, SPF_PASS autolearn=no 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748586721574970793?= X-GMAIL-MSGID: =?utf-8?q?1748586721574970793?= Instead of allocating memory ourselves and doing all the error handling, rely on usb_cache_string(). This results in simpler code. Make es58x_get_product_info() return void. The reason is double: 1/ by using usb_cache_string() we do not know anymore the root cause (is it an allocation issue or input/output issue?) 2/ Failling to get the product info is not critical. So it is OK to continue. Signed-off-by: Vincent Mailhol --- drivers/net/can/usb/etas_es58x/es58x_core.c | 33 +++------------------ drivers/net/can/usb/etas_es58x/es58x_core.h | 3 ++ 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/drivers/net/can/usb/etas_es58x/es58x_core.c b/drivers/net/can/usb/etas_es58x/es58x_core.c index 51294b717040..1a17aadfc1dc 100644 --- a/drivers/net/can/usb/etas_es58x/es58x_core.c +++ b/drivers/net/can/usb/etas_es58x/es58x_core.c @@ -2124,41 +2124,18 @@ static void es58x_free_netdevs(struct es58x_device *es58x_dev) * @es58x_dev: ES58X device. * * Do a synchronous call to get the product information. - * - * Return: zero on success, errno when any error occurs. */ -static int es58x_get_product_info(struct es58x_device *es58x_dev) +static void es58x_get_product_info(struct es58x_device *es58x_dev) { - struct usb_device *udev = es58x_dev->udev; - const int es58x_prod_info_idx = 6; - /* Empirical tests show a prod_info length of maximum 83, - * below should be more than enough. - */ - const size_t prod_info_len = 127; char *prod_info; - int ret; - prod_info = kmalloc(prod_info_len, GFP_KERNEL); + prod_info = usb_cache_string(es58x_dev->udev, ES58X_PROD_INFO_IDX); if (!prod_info) - return -ENOMEM; + return; - ret = usb_string(udev, es58x_prod_info_idx, prod_info, prod_info_len); - if (ret < 0) { - dev_err(es58x_dev->dev, - "%s: Could not read the product info: %pe\n", - __func__, ERR_PTR(ret)); - goto out_free; - } - if (ret >= prod_info_len - 1) { - dev_warn(es58x_dev->dev, - "%s: Buffer is too small, result might be truncated\n", - __func__); - } dev_info(es58x_dev->dev, "Product info: %s\n", prod_info); - out_free: kfree(prod_info); - return ret < 0 ? ret : 0; } /** @@ -2243,9 +2220,7 @@ static int es58x_probe(struct usb_interface *intf, if (IS_ERR(es58x_dev)) return PTR_ERR(es58x_dev); - ret = es58x_get_product_info(es58x_dev); - if (ret) - return ret; + es58x_get_product_info(es58x_dev); for (ch_idx = 0; ch_idx < es58x_dev->num_can_ch; ch_idx++) { ret = es58x_init_netdev(es58x_dev, ch_idx); diff --git a/drivers/net/can/usb/etas_es58x/es58x_core.h b/drivers/net/can/usb/etas_es58x/es58x_core.h index 640fe0a1df63..9a5a616df783 100644 --- a/drivers/net/can/usb/etas_es58x/es58x_core.h +++ b/drivers/net/can/usb/etas_es58x/es58x_core.h @@ -49,6 +49,9 @@ /* A magic number sent by the ES581.4 to inform it is alive. */ #define ES58X_HEARTBEAT 0x11 +/* USB descriptor index containing the product information string. */ +#define ES58X_PROD_INFO_IDX 6 + /** * enum es58x_driver_info - Quirks of the device. * @ES58X_DUAL_CHANNEL: Device has two CAN channels. If this flag is From patchwork Fri Nov 4 17:16:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Mailhol X-Patchwork-Id: 15712 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp535476wru; Fri, 4 Nov 2022 10:18:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7+7Dqu5t9tWLe4oo7W3o4a4jsnyvZb8a3wvTAgY7tBBLlRWZ5q0zOGkGUm/PYY/67CcGVf X-Received: by 2002:a17:902:aa42:b0:17e:b779:dadb with SMTP id c2-20020a170902aa4200b0017eb779dadbmr37000218plr.11.1667582326407; Fri, 04 Nov 2022 10:18:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667582326; cv=none; d=google.com; s=arc-20160816; b=egp834NnBjBpLrZjlM5VXm6z9i1wGAzI4t+hc5D3Z7XGroe+LjvBxIbuhrB1UpFdkh Zhj/9OXTfLuR8hir7at0c+o5ZqRS4A/OLInuZIvqogLjiCApvxw40/lgWwUSlqWIo15k ONXcP7ubLuJsDCDe9Jbf7WqePQ3cT2dyK6MDM4hx9vZ8ZWs7FO2m5hrd/W3fghjrN9WJ 5rHQ5rSaVviyOq58LpHm+bK3rGOyucdmhhshZKIlGW09XW63hjDJpHleqrjmMlpE9F4V /zm9mFFMAy20BBv6jpzFGpLyiJcUGFb8EgFSmWcpHVAXcfsVFTnrVShl3YO4yOUryio9 7iGA== 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:sender :dkim-signature; bh=e0ErP+orkk4G4ShNSRoAumyTCOdV2yHLSVRR3eTBZqY=; b=s/OT0voIZbcw5ip+7Ydt5HTwrwbTjWcQParxb7QXV0uD4s2pVaupB/KSyurzzpEFuq e0Fhrz5FWFD9zC6LGzRj8qpJHrM+D/3Kpd+YFKiZiQU93bWxnJsejMClt1dsaKTOWLeK WIIaVuLJRl+O4nTQSsSwyO874SmUVK8r9IyB+KDVIoZA5lxV7pEDt3DYjv/v9gkmDEBD o1CxMXA61Jj/RIghYZlc0Wszw+p9Eu/+DqgQm9133kd4jpmsU25Vi3U+9CdPBY/BSjO5 zGPG7ic4xebXYG9id9Zjy5WyPd+V2otO6FW6zSGXOCO+KfIj5kz9K2grG0tf7JLRxklP +6kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=pnM3I45G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a7-20020a056a001d0700b0056cdb20de28si4789456pfx.320.2022.11.04.10.18.31; Fri, 04 Nov 2022 10:18:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=pnM3I45G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231831AbiKDRQ6 (ORCPT + 99 others); Fri, 4 Nov 2022 13:16:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231621AbiKDRQq (ORCPT ); Fri, 4 Nov 2022 13:16:46 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CC883E09D; Fri, 4 Nov 2022 10:16:45 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id v17so5500464plo.1; Fri, 04 Nov 2022 10:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=e0ErP+orkk4G4ShNSRoAumyTCOdV2yHLSVRR3eTBZqY=; b=pnM3I45GlSkO+51EPfO/sMnc4irB4Km6/IANDutMalaLXhM0IbxCwbXK1vNBWmD4Cx IaEbe+6qSuyiP+ff+zgSY7A2g6unUQt2J3/kHEciXxbQvFNkLY7qKNeBSfS42DU/Gzm8 4/hOoI/3YQwf2XbCC5lPNk65PRLQESclwUb5kQeFA2K0dIUhLRQeeAl4oExZrO5jwfSo fJd73x2t2uAjgAT0X88cufrQbA+2qnKVn1SqECkojZfFmMtqn3tEc843RIY8b8WgK00r BuY+JKPIaY09w6d4/iMfLl99dklAQ4QKx7a6htaodAdv8DjWmfSxoCErE4l28o1XN0sU ZtEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=e0ErP+orkk4G4ShNSRoAumyTCOdV2yHLSVRR3eTBZqY=; b=pjbhcPRfoak/KUVrwcC6pJp9HzxEFQeZqxbKDGGtzrUryzsHRNFvIANjU3xsBxH4ez X5s+4sDCJF/eCrnrTxYf+mE2Ncrbp+IP40EvhMnU803ePfeE+rcsloAiocsGUi4Pnxpd 8gJyCcL4s6rOr1eBopcDuJVVB45AK4Zs1sffvAWTISer0L80iQP5A86QOiwnCxxt6FFy odbmL7Ft1V7R+LlAZBLYEir+IuqK08MFNxQV4RB/GvC4GL1SM9TrkPNLa1MKRsqOPliB NNFrl0wcgdDfIXt93YaaOvxSq/incJStLPV9AfSQ+zmjwA15xYF/GzhJd806eBpuX26S kKJQ== X-Gm-Message-State: ACrzQf04cyEkWTMVqy5BXZ7VAZ3CpKomwLfSvBuxiF/Z/zMnhjaVEuKG IGlVUsapz73mM/BvMTVwodpDvZR8No4= X-Received: by 2002:a17:903:2308:b0:186:f608:c509 with SMTP id d8-20020a170903230800b00186f608c509mr36996999plh.154.1667582204511; Fri, 04 Nov 2022 10:16:44 -0700 (PDT) Received: from localhost.localdomain (124x33x176x97.ap124.ftth.ucom.ne.jp. [124.33.176.97]) by smtp.gmail.com with ESMTPSA id u15-20020a17090a450f00b00212c27abcaesm1917655pjg.17.2022.11.04.10.16.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 10:16:44 -0700 (PDT) Sender: Vincent Mailhol From: Vincent Mailhol To: linux-can@vger.kernel.org Cc: Marc Kleine-Budde , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Vincent Mailhol Subject: [PATCH v2 3/3] can: etas_es58x: report the firmware version through ethtool Date: Sat, 5 Nov 2022 02:16:04 +0900 Message-Id: <20221104171604.24052-4-mailhol.vincent@wanadoo.fr> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221104171604.24052-1-mailhol.vincent@wanadoo.fr> References: <20221104073659.414147-1-mailhol.vincent@wanadoo.fr> <20221104171604.24052-1-mailhol.vincent@wanadoo.fr> MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE, SPF_PASS autolearn=no 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748551562710711621?= X-GMAIL-MSGID: =?utf-8?q?1748586805361448582?= ES58x devices report below information in their usb product info string: * the firmware version * the bootloader version * the hardware revision Report the firmware version through ethtool_drvinfo::fw_version. Because struct ethtool_drvinfo has no fields to report the boatloader version nor the hardware revision, continue to print these in the kernel log (c.f. es58x_get_product_info()). While doing so, bump up copyright year of each modified files. Signed-off-by: Vincent Mailhol --- drivers/net/can/usb/etas_es58x/es581_4.c | 5 ++- drivers/net/can/usb/etas_es58x/es58x_core.c | 42 ++++++++++++++++++++- drivers/net/can/usb/etas_es58x/es58x_core.h | 5 ++- drivers/net/can/usb/etas_es58x/es58x_fd.c | 5 ++- 4 files changed, 51 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/usb/etas_es58x/es581_4.c b/drivers/net/can/usb/etas_es58x/es581_4.c index 1bcdcece5ec7..29c03c8b3f07 100644 --- a/drivers/net/can/usb/etas_es58x/es581_4.c +++ b/drivers/net/can/usb/etas_es58x/es581_4.c @@ -6,7 +6,7 @@ * * Copyright (c) 2019 Robert Bosch Engineering and Business Solutions. All rights reserved. * Copyright (c) 2020 ETAS K.K.. All rights reserved. - * Copyright (c) 2020, 2021 Vincent Mailhol + * Copyright (c) 2020-2022 Vincent Mailhol */ #include @@ -492,7 +492,8 @@ const struct es58x_parameters es581_4_param = { .tx_bulk_max = ES581_4_TX_BULK_MAX, .urb_cmd_header_len = ES581_4_URB_CMD_HEADER_LEN, .rx_urb_max = ES58X_RX_URBS_MAX, - .tx_urb_max = ES58X_TX_URBS_MAX + .tx_urb_max = ES58X_TX_URBS_MAX, + .prod_info_delim = ',', }; const struct es58x_operators es581_4_ops = { diff --git a/drivers/net/can/usb/etas_es58x/es58x_core.c b/drivers/net/can/usb/etas_es58x/es58x_core.c index 1a17aadfc1dc..72a60f5f92c8 100644 --- a/drivers/net/can/usb/etas_es58x/es58x_core.c +++ b/drivers/net/can/usb/etas_es58x/es58x_core.c @@ -7,7 +7,7 @@ * * Copyright (c) 2019 Robert Bosch Engineering and Business Solutions. All rights reserved. * Copyright (c) 2020 ETAS K.K.. All rights reserved. - * Copyright (c) 2020, 2021 Vincent Mailhol + * Copyright (c) 2020-2022 Vincent Mailhol */ #include @@ -1978,7 +1978,47 @@ static const struct net_device_ops es58x_netdev_ops = { .ndo_eth_ioctl = can_eth_ioctl_hwts, }; +/** + * es58x_get_drvinfo() - Get the driver name and firmware version. + * @netdev: CAN network device. + * @drvinfo: Driver information. + * + * Populate @drvinfo with the driver name and the firmware version. + */ +static void es58x_get_drvinfo(struct net_device *netdev, + struct ethtool_drvinfo *drvinfo) +{ + struct es58x_device *es58x_dev = es58x_priv(netdev)->es58x_dev; + char *prod_info, *start, *end; + + strscpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver)); + + prod_info = usb_cache_string(es58x_dev->udev, ES58X_PROD_INFO_IDX); + if (!prod_info) + return; + + /* The firmware prefix is either "FW_V" or "FW:" */ + start = strstr(prod_info, "FW"); + if (!start) + goto free_prod_info; + /* Go to first digit */ + while (!isdigit(*start)) { + start++; + if (!*start) + goto free_prod_info; + } + end = strchr(start, es58x_dev->param->prod_info_delim); + if (!end || end - start >= sizeof(drvinfo->fw_version)) + goto free_prod_info; + + strncpy(drvinfo->fw_version, start, end - start); + + free_prod_info: + kfree(prod_info); +} + static const struct ethtool_ops es58x_ethtool_ops = { + .get_drvinfo = es58x_get_drvinfo, .get_ts_info = can_ethtool_op_get_ts_info_hwts, }; diff --git a/drivers/net/can/usb/etas_es58x/es58x_core.h b/drivers/net/can/usb/etas_es58x/es58x_core.h index 9a5a616df783..9c2cdb57f34a 100644 --- a/drivers/net/can/usb/etas_es58x/es58x_core.h +++ b/drivers/net/can/usb/etas_es58x/es58x_core.h @@ -6,7 +6,7 @@ * * Copyright (c) 2019 Robert Bosch Engineering and Business Solutions. All rights reserved. * Copyright (c) 2020 ETAS K.K.. All rights reserved. - * Copyright (c) 2020, 2021 Vincent Mailhol + * Copyright (c) 2020-2022 Vincent Mailhol */ #ifndef __ES58X_COMMON_H__ @@ -309,6 +309,8 @@ struct es58x_priv { * @urb_cmd_header_len: Length of the URB command header. * @rx_urb_max: Number of RX URB to be allocated during device probe. * @tx_urb_max: Number of TX URB to be allocated during device probe. + * @prod_info_delim: delimiter of the different fields in the USB + * product information string. */ struct es58x_parameters { const struct can_bittiming_const *bittiming_const; @@ -327,6 +329,7 @@ struct es58x_parameters { u8 urb_cmd_header_len; u8 rx_urb_max; u8 tx_urb_max; + char prod_info_delim; }; /** diff --git a/drivers/net/can/usb/etas_es58x/es58x_fd.c b/drivers/net/can/usb/etas_es58x/es58x_fd.c index c97ffa71fd75..aa7a4866f870 100644 --- a/drivers/net/can/usb/etas_es58x/es58x_fd.c +++ b/drivers/net/can/usb/etas_es58x/es58x_fd.c @@ -8,7 +8,7 @@ * * Copyright (c) 2019 Robert Bosch Engineering and Business Solutions. All rights reserved. * Copyright (c) 2020 ETAS K.K.. All rights reserved. - * Copyright (c) 2020, 2021 Vincent Mailhol + * Copyright (c) 2020-2022 Vincent Mailhol */ #include @@ -550,7 +550,8 @@ const struct es58x_parameters es58x_fd_param = { .tx_bulk_max = ES58X_FD_TX_BULK_MAX, .urb_cmd_header_len = ES58X_FD_URB_CMD_HEADER_LEN, .rx_urb_max = ES58X_RX_URBS_MAX, - .tx_urb_max = ES58X_TX_URBS_MAX + .tx_urb_max = ES58X_TX_URBS_MAX, + .prod_info_delim = '-', }; const struct es58x_operators es58x_fd_ops = {