From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8614DC63777 for ; Sat, 28 Nov 2020 21:55:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 330E7208CA for ; Sat, 28 Nov 2020 21:55:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404129AbgK1Vyl (ORCPT ); Sat, 28 Nov 2020 16:54:41 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:37752 "EHLO mail-ej1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729437AbgK1TSD (ORCPT ); Sat, 28 Nov 2020 14:18:03 -0500 Received: by mail-ej1-f68.google.com with SMTP id f9so10383618ejw.4; Sat, 28 Nov 2020 11:17:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=yusIMZ2Y3C0T1nr2J+PHt7ilVpsQQ+TaY1wBN9Xc7yY=; b=K39xUJ+1/vprCqlQ2XcUQiiWtVOa3ivt1AAITwNtztOylpxBwkd33jLJ8GH587leAx yvRslLArQH4T3hw+GqmbDwHZ/s6tpIzUhOLWMLoAVzGZSxk5vISaLg/2+6I83FRTcir8 CTOr/Haoavf5vyg/ANfstlLMBoS7YyToYH0pZNpU0+F/H1TyfzWJOUr30e8dewVrrzby na7hAcO/lMV+GL03M/ItvW2fCmqJnmuqLQD0+1y+8XEXDJKKoGydgxfdckC7KRmOIF0R qfEMOtiIoX8UjNtGbNC7kDk3cNlRQoNrfAuzDP4Sx3mY1glZ1+onIjmTwb6j0gl6bcPv j7NA== X-Gm-Message-State: AOAM530HrpRTniUx2Hk/N2D9wdquSmtUNQpDpEmys90TlNZj6se0XsnI xNtoV+sHukIqA7hcSlurfhEcJhm3zwU= X-Google-Smtp-Source: ABdhPJz8cXwM86QOXd98OGFI+SYT7WpBOhgx7KR7daHRAzVETjTOjLJuzF9P0ho183Rd1ulVJkC94g== X-Received: by 2002:a50:ab07:: with SMTP id s7mr12827539edc.374.1606563957702; Sat, 28 Nov 2020 03:45:57 -0800 (PST) Received: from kozik-lap (adsl-84-226-167-205.adslplus.ch. [84.226.167.205]) by smtp.googlemail.com with ESMTPSA id p20sm6081276ejd.78.2020.11.28.03.45.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Nov 2020 03:45:56 -0800 (PST) Date: Sat, 28 Nov 2020 12:45:55 +0100 From: Krzysztof Kozlowski To: Bongsu Jeon Cc: k.opasiak@samsung.com, linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bongsu Jeon Subject: Re: [PATCH net-next 3/3] nfc: s3fwrn5: extract the common phy blocks Message-ID: <20201128114555.GA6313@kozik-lap> References: <1606404819-30647-1-git-send-email-bongsu.jeon@samsung.com> <1606404819-30647-3-git-send-email-bongsu.jeon@samsung.com> <20201126171257.GC4978@kozik-lap> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Nov 27, 2020 at 08:09:24AM +0900, Bongsu Jeon wrote: > On Fri, Nov 27, 2020 at 2:13 AM Krzysztof Kozlowski wrote: > > > > On Fri, Nov 27, 2020 at 12:33:39AM +0900, bongsu.jeon2@gmail.com wrote: > > > From: Bongsu Jeon > > > > > > Extract the common phy blocks to reuse it. > > > The UART module will use the common blocks. > > > > > > Hi, > > > > Thanks for the patch. Few comments below. > > > > > Signed-off-by: Bongsu Jeon > > > --- > > > drivers/nfc/s3fwrn5/i2c.c | 111 ++++++++++++--------------------------- > > > drivers/nfc/s3fwrn5/phy_common.h | 86 ++++++++++++++++++++++++++++++ > > > 2 files changed, 119 insertions(+), 78 deletions(-) > > > create mode 100644 drivers/nfc/s3fwrn5/phy_common.h > > > > > > diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c > > > index 9a64eea..cd1b2a7 100644 > > > --- a/drivers/nfc/s3fwrn5/i2c.c > > > +++ b/drivers/nfc/s3fwrn5/i2c.c > > > @@ -15,75 +15,30 @@ > > > > > > #include > > > > > > -#include "s3fwrn5.h" > > > +#include "phy_common.h" > > > > > > #define S3FWRN5_I2C_DRIVER_NAME "s3fwrn5_i2c" > > > > > > -#define S3FWRN5_EN_WAIT_TIME 20 > > > - > > > struct s3fwrn5_i2c_phy { > > > + struct phy_common common; > > > struct i2c_client *i2c_dev; > > > - struct nci_dev *ndev; > > > - > > > - int gpio_en; > > > - int gpio_fw_wake; > > > - > > > - struct mutex mutex; > > > > > > - enum s3fwrn5_mode mode; > > > unsigned int irq_skip:1; > > > }; > > > > > > -static void s3fwrn5_i2c_set_wake(void *phy_id, bool wake) > > > -{ > > > - struct s3fwrn5_i2c_phy *phy = phy_id; > > > - > > > - mutex_lock(&phy->mutex); > > > - gpio_set_value(phy->gpio_fw_wake, wake); > > > - msleep(S3FWRN5_EN_WAIT_TIME); > > > - mutex_unlock(&phy->mutex); > > > -} > > > - > > > static void s3fwrn5_i2c_set_mode(void *phy_id, enum s3fwrn5_mode mode) > > > { > > > struct s3fwrn5_i2c_phy *phy = phy_id; > > > > > > - mutex_lock(&phy->mutex); > > > + mutex_lock(&phy->common.mutex); > > > > > > - if (phy->mode == mode) > > > + if (s3fwrn5_phy_power_ctrl(&phy->common, mode) == false) > > > goto out; > > > > > > - phy->mode = mode; > > > - > > > - gpio_set_value(phy->gpio_en, 1); > > > - gpio_set_value(phy->gpio_fw_wake, 0); > > > - if (mode == S3FWRN5_MODE_FW) > > > - gpio_set_value(phy->gpio_fw_wake, 1); > > > - > > > - if (mode != S3FWRN5_MODE_COLD) { > > > - msleep(S3FWRN5_EN_WAIT_TIME); > > > - gpio_set_value(phy->gpio_en, 0); > > > - msleep(S3FWRN5_EN_WAIT_TIME); > > > - } > > > - > > > phy->irq_skip = true; > > > > > > out: > > > - mutex_unlock(&phy->mutex); > > > -} > > > - > > > -static enum s3fwrn5_mode s3fwrn5_i2c_get_mode(void *phy_id) > > > -{ > > > - struct s3fwrn5_i2c_phy *phy = phy_id; > > > - enum s3fwrn5_mode mode; > > > - > > > - mutex_lock(&phy->mutex); > > > - > > > - mode = phy->mode; > > > - > > > - mutex_unlock(&phy->mutex); > > > - > > > - return mode; > > > + mutex_unlock(&phy->common.mutex); > > > } > > > > > > static int s3fwrn5_i2c_write(void *phy_id, struct sk_buff *skb) > > > @@ -91,7 +46,7 @@ static int s3fwrn5_i2c_write(void *phy_id, struct sk_buff *skb) > > > struct s3fwrn5_i2c_phy *phy = phy_id; > > > int ret; > > > > > > - mutex_lock(&phy->mutex); > > > + mutex_lock(&phy->common.mutex); > > > > > > phy->irq_skip = false; > > > > > > @@ -102,7 +57,7 @@ static int s3fwrn5_i2c_write(void *phy_id, struct sk_buff *skb) > > > ret = i2c_master_send(phy->i2c_dev, skb->data, skb->len); > > > } > > > > > > - mutex_unlock(&phy->mutex); > > > + mutex_unlock(&phy->common.mutex); > > > > > > if (ret < 0) > > > return ret; > > > @@ -114,9 +69,9 @@ static int s3fwrn5_i2c_write(void *phy_id, struct sk_buff *skb) > > > } > > > > > > static const struct s3fwrn5_phy_ops i2c_phy_ops = { > > > - .set_wake = s3fwrn5_i2c_set_wake, > > > + .set_wake = s3fwrn5_phy_set_wake, > > > .set_mode = s3fwrn5_i2c_set_mode, > > > - .get_mode = s3fwrn5_i2c_get_mode, > > > + .get_mode = s3fwrn5_phy_get_mode, > > > .write = s3fwrn5_i2c_write, > > > }; > > > > > > @@ -128,7 +83,7 @@ static int s3fwrn5_i2c_read(struct s3fwrn5_i2c_phy *phy) > > > char hdr[4]; > > > int ret; > > > > > > - hdr_size = (phy->mode == S3FWRN5_MODE_NCI) ? > > > + hdr_size = (phy->common.mode == S3FWRN5_MODE_NCI) ? > > > NCI_CTRL_HDR_SIZE : S3FWRN5_FW_HDR_SIZE; > > > ret = i2c_master_recv(phy->i2c_dev, hdr, hdr_size); > > > if (ret < 0) > > > @@ -137,7 +92,7 @@ static int s3fwrn5_i2c_read(struct s3fwrn5_i2c_phy *phy) > > > if (ret < hdr_size) > > > return -EBADMSG; > > > > > > - data_len = (phy->mode == S3FWRN5_MODE_NCI) ? > > > + data_len = (phy->common.mode == S3FWRN5_MODE_NCI) ? > > > ((struct nci_ctrl_hdr *)hdr)->plen : > > > ((struct s3fwrn5_fw_header *)hdr)->len; > > > > > > @@ -157,24 +112,24 @@ static int s3fwrn5_i2c_read(struct s3fwrn5_i2c_phy *phy) > > > } > > > > > > out: > > > - return s3fwrn5_recv_frame(phy->ndev, skb, phy->mode); > > > + return s3fwrn5_recv_frame(phy->common.ndev, skb, phy->common.mode); > > > } > > > > > > static irqreturn_t s3fwrn5_i2c_irq_thread_fn(int irq, void *phy_id) > > > { > > > struct s3fwrn5_i2c_phy *phy = phy_id; > > > > > > - if (!phy || !phy->ndev) { > > > + if (!phy || !phy->common.ndev) { > > > WARN_ON_ONCE(1); > > > return IRQ_NONE; > > > } > > > > > > - mutex_lock(&phy->mutex); > > > + mutex_lock(&phy->common.mutex); > > > > > > if (phy->irq_skip) > > > goto out; > > > > > > - switch (phy->mode) { > > > + switch (phy->common.mode) { > > > case S3FWRN5_MODE_NCI: > > > case S3FWRN5_MODE_FW: > > > s3fwrn5_i2c_read(phy); > > > @@ -184,7 +139,7 @@ static irqreturn_t s3fwrn5_i2c_irq_thread_fn(int irq, void *phy_id) > > > } > > > > > > out: > > > - mutex_unlock(&phy->mutex); > > > + mutex_unlock(&phy->common.mutex); > > > > > > return IRQ_HANDLED; > > > } > > > @@ -197,19 +152,19 @@ static int s3fwrn5_i2c_parse_dt(struct i2c_client *client) > > > if (!np) > > > return -ENODEV; > > > > > > - phy->gpio_en = of_get_named_gpio(np, "en-gpios", 0); > > > - if (!gpio_is_valid(phy->gpio_en)) { > > > + phy->common.gpio_en = of_get_named_gpio(np, "en-gpios", 0); > > > + if (!gpio_is_valid(phy->common.gpio_en)) { > > > /* Support also deprecated property */ > > > - phy->gpio_en = of_get_named_gpio(np, "s3fwrn5,en-gpios", 0); > > > - if (!gpio_is_valid(phy->gpio_en)) > > > + phy->common.gpio_en = of_get_named_gpio(np, "s3fwrn5,en-gpios", 0); > > > + if (!gpio_is_valid(phy->common.gpio_en)) > > > return -ENODEV; > > > } > > > > > > - phy->gpio_fw_wake = of_get_named_gpio(np, "wake-gpios", 0); > > > - if (!gpio_is_valid(phy->gpio_fw_wake)) { > > > + phy->common.gpio_fw_wake = of_get_named_gpio(np, "wake-gpios", 0); > > > + if (!gpio_is_valid(phy->common.gpio_fw_wake)) { > > > /* Support also deprecated property */ > > > - phy->gpio_fw_wake = of_get_named_gpio(np, "s3fwrn5,fw-gpios", 0); > > > - if (!gpio_is_valid(phy->gpio_fw_wake)) > > > + phy->common.gpio_fw_wake = of_get_named_gpio(np, "s3fwrn5,fw-gpios", 0); > > > > The lines here should wrap at 80 character. > > > > > + if (!gpio_is_valid(phy->common.gpio_fw_wake)) > > > return -ENODEV; > > > } > > > > > > @@ -226,8 +181,8 @@ static int s3fwrn5_i2c_probe(struct i2c_client *client, > > > if (!phy) > > > return -ENOMEM; > > > > > > - mutex_init(&phy->mutex); > > > - phy->mode = S3FWRN5_MODE_COLD; > > > + mutex_init(&phy->common.mutex); > > > + phy->common.mode = S3FWRN5_MODE_COLD; > > > phy->irq_skip = true; > > > > > > phy->i2c_dev = client; > > > @@ -237,17 +192,17 @@ static int s3fwrn5_i2c_probe(struct i2c_client *client, > > > if (ret < 0) > > > return ret; > > > > > > - ret = devm_gpio_request_one(&phy->i2c_dev->dev, phy->gpio_en, > > > - GPIOF_OUT_INIT_HIGH, "s3fwrn5_en"); > > > + ret = devm_gpio_request_one(&phy->i2c_dev->dev, phy->common.gpio_en, > > > + GPIOF_OUT_INIT_HIGH, "s3fwrn5_en"); > > > if (ret < 0) > > > return ret; > > > > > > - ret = devm_gpio_request_one(&phy->i2c_dev->dev, phy->gpio_fw_wake, > > > - GPIOF_OUT_INIT_LOW, "s3fwrn5_fw_wake"); > > > + ret = devm_gpio_request_one(&phy->i2c_dev->dev, phy->common.gpio_fw_wake, > > > + GPIOF_OUT_INIT_LOW, "s3fwrn5_fw_wake"); > > > if (ret < 0) > > > return ret; > > > > > > - ret = s3fwrn5_probe(&phy->ndev, phy, &phy->i2c_dev->dev, &i2c_phy_ops); > > > + ret = s3fwrn5_probe(&phy->common.ndev, phy, &phy->i2c_dev->dev, &i2c_phy_ops); > > > > Please wrap the lines. > > > > > if (ret < 0) > > > return ret; > > > > > > @@ -255,7 +210,7 @@ static int s3fwrn5_i2c_probe(struct i2c_client *client, > > > s3fwrn5_i2c_irq_thread_fn, IRQF_TRIGGER_HIGH | IRQF_ONESHOT, > > > S3FWRN5_I2C_DRIVER_NAME, phy); > > > if (ret) > > > - s3fwrn5_remove(phy->ndev); > > > + s3fwrn5_remove(phy->common.ndev); > > > > > > return ret; > > > } > > > @@ -264,7 +219,7 @@ static int s3fwrn5_i2c_remove(struct i2c_client *client) > > > { > > > struct s3fwrn5_i2c_phy *phy = i2c_get_clientdata(client); > > > > > > - s3fwrn5_remove(phy->ndev); > > > + s3fwrn5_remove(phy->common.ndev); > > > > > > return 0; > > > } > > > diff --git a/drivers/nfc/s3fwrn5/phy_common.h b/drivers/nfc/s3fwrn5/phy_common.h > > > new file mode 100644 > > > index 0000000..14f7690 > > > --- /dev/null > > > +++ b/drivers/nfc/s3fwrn5/phy_common.h > > > @@ -0,0 +1,86 @@ > > > +/* SPDX-License-Identifier: GPL-2.0-or-later > > > + * > > > + * Link Layer for Samsung S3FWRN5 NCI based Driver > > > + * > > > + * Copyright (C) 2015 Samsung Electrnoics > > > + * Robert Baldyga > > > + * Copyright (C) 2020 Samsung Electrnoics > > > + * Bongsu Jeon > > > + */ > > > + > > > +#ifndef __LOCAL_PHY_COMMON_H > > > +#define __LOCAL_PHY_COMMON_H > > > > Header guard: __NFC_S3FWRN5_PHY_COMMON_H > > > > > + > > > +#include "s3fwrn5.h" > > > > This include should not be needed. > > > > Actually, I included this because of enum s3fwrn5_mode. > Do you think the following structure is good? > > 0. remove the '#include "s3fwrn5.h" and the common function's > definition in phy_common.h. > 1. make phy_common.c that includes the common function's definition > and "s3fwrn5.h , phy_common.h". > 2. i2c.c includes "s3fwrn5.h , phy_common.h". It looks like you already sent v2... I'll skip answering here then. Best regards, Krzysztof From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============5943936541548741153==" MIME-Version: 1.0 From: Krzysztof Kozlowski To: linux-nfc@lists.01.org Subject: [linux-nfc] Re: [PATCH net-next 3/3] nfc: s3fwrn5: extract the common phy blocks Date: Sat, 28 Nov 2020 12:45:55 +0100 Message-ID: <20201128114555.GA6313@kozik-lap> In-Reply-To: CACwDmQAi+DfjWSzrWQd+EFDy+6Jk8VVCigpCcCC=OBg0m-PbXg@mail.gmail.com --===============5943936541548741153== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable On Fri, Nov 27, 2020@08:09:24AM +0900, Bongsu Jeon wrote: > On Fri, Nov 27, 2020@2:13 AM Krzysztof Kozlowski w= rote: > > > > On Fri, Nov 27, 2020@12:33:39AM +0900, bongsu.jeon2@gmail.com wrot= e: > > > From: Bongsu Jeon > > > > > > Extract the common phy blocks to reuse it. > > > The UART module will use the common blocks. > > > > > > Hi, > > > > Thanks for the patch. Few comments below. > > > > > Signed-off-by: Bongsu Jeon > > > --- > > > drivers/nfc/s3fwrn5/i2c.c | 111 ++++++++++++-----------------= ---------- > > > drivers/nfc/s3fwrn5/phy_common.h | 86 ++++++++++++++++++++++++++++++ > > > 2 files changed, 119 insertions(+), 78 deletions(-) > > > create mode 100644 drivers/nfc/s3fwrn5/phy_common.h > > > > > > diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c > > > index 9a64eea..cd1b2a7 100644 > > > --- a/drivers/nfc/s3fwrn5/i2c.c > > > +++ b/drivers/nfc/s3fwrn5/i2c.c > > > @@ -15,75 +15,30 @@ > > > > > > #include > > > > > > -#include "s3fwrn5.h" > > > +#include "phy_common.h" > > > > > > #define S3FWRN5_I2C_DRIVER_NAME "s3fwrn5_i2c" > > > > > > -#define S3FWRN5_EN_WAIT_TIME 20 > > > - > > > struct s3fwrn5_i2c_phy { > > > + struct phy_common common; > > > struct i2c_client *i2c_dev; > > > - struct nci_dev *ndev; > > > - > > > - int gpio_en; > > > - int gpio_fw_wake; > > > - > > > - struct mutex mutex; > > > > > > - enum s3fwrn5_mode mode; > > > unsigned int irq_skip:1; > > > }; > > > > > > -static void s3fwrn5_i2c_set_wake(void *phy_id, bool wake) > > > -{ > > > - struct s3fwrn5_i2c_phy *phy =3D phy_id; > > > - > > > - mutex_lock(&phy->mutex); > > > - gpio_set_value(phy->gpio_fw_wake, wake); > > > - msleep(S3FWRN5_EN_WAIT_TIME); > > > - mutex_unlock(&phy->mutex); > > > -} > > > - > > > static void s3fwrn5_i2c_set_mode(void *phy_id, enum s3fwrn5_mode mod= e) > > > { > > > struct s3fwrn5_i2c_phy *phy =3D phy_id; > > > > > > - mutex_lock(&phy->mutex); > > > + mutex_lock(&phy->common.mutex); > > > > > > - if (phy->mode =3D=3D mode) > > > + if (s3fwrn5_phy_power_ctrl(&phy->common, mode) =3D=3D false) > > > goto out; > > > > > > - phy->mode =3D mode; > > > - > > > - gpio_set_value(phy->gpio_en, 1); > > > - gpio_set_value(phy->gpio_fw_wake, 0); > > > - if (mode =3D=3D S3FWRN5_MODE_FW) > > > - gpio_set_value(phy->gpio_fw_wake, 1); > > > - > > > - if (mode !=3D S3FWRN5_MODE_COLD) { > > > - msleep(S3FWRN5_EN_WAIT_TIME); > > > - gpio_set_value(phy->gpio_en, 0); > > > - msleep(S3FWRN5_EN_WAIT_TIME); > > > - } > > > - > > > phy->irq_skip =3D true; > > > > > > out: > > > - mutex_unlock(&phy->mutex); > > > -} > > > - > > > -static enum s3fwrn5_mode s3fwrn5_i2c_get_mode(void *phy_id) > > > -{ > > > - struct s3fwrn5_i2c_phy *phy =3D phy_id; > > > - enum s3fwrn5_mode mode; > > > - > > > - mutex_lock(&phy->mutex); > > > - > > > - mode =3D phy->mode; > > > - > > > - mutex_unlock(&phy->mutex); > > > - > > > - return mode; > > > + mutex_unlock(&phy->common.mutex); > > > } > > > > > > static int s3fwrn5_i2c_write(void *phy_id, struct sk_buff *skb) > > > @@ -91,7 +46,7 @@ static int s3fwrn5_i2c_write(void *phy_id, struct s= k_buff *skb) > > > struct s3fwrn5_i2c_phy *phy =3D phy_id; > > > int ret; > > > > > > - mutex_lock(&phy->mutex); > > > + mutex_lock(&phy->common.mutex); > > > > > > phy->irq_skip =3D false; > > > > > > @@ -102,7 +57,7 @@ static int s3fwrn5_i2c_write(void *phy_id, struct = sk_buff *skb) > > > ret =3D i2c_master_send(phy->i2c_dev, skb->data, skb->= len); > > > } > > > > > > - mutex_unlock(&phy->mutex); > > > + mutex_unlock(&phy->common.mutex); > > > > > > if (ret < 0) > > > return ret; > > > @@ -114,9 +69,9 @@ static int s3fwrn5_i2c_write(void *phy_id, struct = sk_buff *skb) > > > } > > > > > > static const struct s3fwrn5_phy_ops i2c_phy_ops =3D { > > > - .set_wake =3D s3fwrn5_i2c_set_wake, > > > + .set_wake =3D s3fwrn5_phy_set_wake, > > > .set_mode =3D s3fwrn5_i2c_set_mode, > > > - .get_mode =3D s3fwrn5_i2c_get_mode, > > > + .get_mode =3D s3fwrn5_phy_get_mode, > > > .write =3D s3fwrn5_i2c_write, > > > }; > > > > > > @@ -128,7 +83,7 @@ static int s3fwrn5_i2c_read(struct s3fwrn5_i2c_phy= *phy) > > > char hdr[4]; > > > int ret; > > > > > > - hdr_size =3D (phy->mode =3D=3D S3FWRN5_MODE_NCI) ? > > > + hdr_size =3D (phy->common.mode =3D=3D S3FWRN5_MODE_NCI) ? > > > NCI_CTRL_HDR_SIZE : S3FWRN5_FW_HDR_SIZE; > > > ret =3D i2c_master_recv(phy->i2c_dev, hdr, hdr_size); > > > if (ret < 0) > > > @@ -137,7 +92,7 @@ static int s3fwrn5_i2c_read(struct s3fwrn5_i2c_phy= *phy) > > > if (ret < hdr_size) > > > return -EBADMSG; > > > > > > - data_len =3D (phy->mode =3D=3D S3FWRN5_MODE_NCI) ? > > > + data_len =3D (phy->common.mode =3D=3D S3FWRN5_MODE_NCI) ? > > > ((struct nci_ctrl_hdr *)hdr)->plen : > > > ((struct s3fwrn5_fw_header *)hdr)->len; > > > > > > @@ -157,24 +112,24 @@ static int s3fwrn5_i2c_read(struct s3fwrn5_i2c_= phy *phy) > > > } > > > > > > out: > > > - return s3fwrn5_recv_frame(phy->ndev, skb, phy->mode); > > > + return s3fwrn5_recv_frame(phy->common.ndev, skb, phy->common.mo= de); > > > } > > > > > > static irqreturn_t s3fwrn5_i2c_irq_thread_fn(int irq, void *phy_id) > > > { > > > struct s3fwrn5_i2c_phy *phy =3D phy_id; > > > > > > - if (!phy || !phy->ndev) { > > > + if (!phy || !phy->common.ndev) { > > > WARN_ON_ONCE(1); > > > return IRQ_NONE; > > > } > > > > > > - mutex_lock(&phy->mutex); > > > + mutex_lock(&phy->common.mutex); > > > > > > if (phy->irq_skip) > > > goto out; > > > > > > - switch (phy->mode) { > > > + switch (phy->common.mode) { > > > case S3FWRN5_MODE_NCI: > > > case S3FWRN5_MODE_FW: > > > s3fwrn5_i2c_read(phy); > > > @@ -184,7 +139,7 @@ static irqreturn_t s3fwrn5_i2c_irq_thread_fn(int = irq, void *phy_id) > > > } > > > > > > out: > > > - mutex_unlock(&phy->mutex); > > > + mutex_unlock(&phy->common.mutex); > > > > > > return IRQ_HANDLED; > > > } > > > @@ -197,19 +152,19 @@ static int s3fwrn5_i2c_parse_dt(struct i2c_clie= nt *client) > > > if (!np) > > > return -ENODEV; > > > > > > - phy->gpio_en =3D of_get_named_gpio(np, "en-gpios", 0); > > > - if (!gpio_is_valid(phy->gpio_en)) { > > > + phy->common.gpio_en =3D of_get_named_gpio(np, "en-gpios", 0); > > > + if (!gpio_is_valid(phy->common.gpio_en)) { > > > /* Support also deprecated property */ > > > - phy->gpio_en =3D of_get_named_gpio(np, "s3fwrn5,en-gpio= s", 0); > > > - if (!gpio_is_valid(phy->gpio_en)) > > > + phy->common.gpio_en =3D of_get_named_gpio(np, "s3fwrn5,= en-gpios", 0); > > > + if (!gpio_is_valid(phy->common.gpio_en)) > > > return -ENODEV; > > > } > > > > > > - phy->gpio_fw_wake =3D of_get_named_gpio(np, "wake-gpios", 0); > > > - if (!gpio_is_valid(phy->gpio_fw_wake)) { > > > + phy->common.gpio_fw_wake =3D of_get_named_gpio(np, "wake-gpios"= , 0); > > > + if (!gpio_is_valid(phy->common.gpio_fw_wake)) { > > > /* Support also deprecated property */ > > > - phy->gpio_fw_wake =3D of_get_named_gpio(np, "s3fwrn5,fw= -gpios", 0); > > > - if (!gpio_is_valid(phy->gpio_fw_wake)) > > > + phy->common.gpio_fw_wake =3D of_get_named_gpio(np, "s3f= wrn5,fw-gpios", 0); > > > > The lines here should wrap@80 character. > > > > > + if (!gpio_is_valid(phy->common.gpio_fw_wake)) > > > return -ENODEV; > > > } > > > > > > @@ -226,8 +181,8 @@ static int s3fwrn5_i2c_probe(struct i2c_client *c= lient, > > > if (!phy) > > > return -ENOMEM; > > > > > > - mutex_init(&phy->mutex); > > > - phy->mode =3D S3FWRN5_MODE_COLD; > > > + mutex_init(&phy->common.mutex); > > > + phy->common.mode =3D S3FWRN5_MODE_COLD; > > > phy->irq_skip =3D true; > > > > > > phy->i2c_dev =3D client; > > > @@ -237,17 +192,17 @@ static int s3fwrn5_i2c_probe(struct i2c_client = *client, > > > if (ret < 0) > > > return ret; > > > > > > - ret =3D devm_gpio_request_one(&phy->i2c_dev->dev, phy->gpio_en, > > > - GPIOF_OUT_INIT_HIGH, "s3fwrn5_en"); > > > + ret =3D devm_gpio_request_one(&phy->i2c_dev->dev, phy->common.g= pio_en, > > > + GPIOF_OUT_INIT_HIGH, "s3fwrn5_en"); > > > if (ret < 0) > > > return ret; > > > > > > - ret =3D devm_gpio_request_one(&phy->i2c_dev->dev, phy->gpio_fw_= wake, > > > - GPIOF_OUT_INIT_LOW, "s3fwrn5_fw_wake"); > > > + ret =3D devm_gpio_request_one(&phy->i2c_dev->dev, phy->common.g= pio_fw_wake, > > > + GPIOF_OUT_INIT_LOW, "s3fwrn5_fw_wak= e"); > > > if (ret < 0) > > > return ret; > > > > > > - ret =3D s3fwrn5_probe(&phy->ndev, phy, &phy->i2c_dev->dev, &i2c= _phy_ops); > > > + ret =3D s3fwrn5_probe(&phy->common.ndev, phy, &phy->i2c_dev->de= v, &i2c_phy_ops); > > > > Please wrap the lines. > > > > > if (ret < 0) > > > return ret; > > > > > > @@ -255,7 +210,7 @@ static int s3fwrn5_i2c_probe(struct i2c_client *c= lient, > > > s3fwrn5_i2c_irq_thread_fn, IRQF_TRIGGER_HIGH | IRQF_ONE= SHOT, > > > S3FWRN5_I2C_DRIVER_NAME, phy); > > > if (ret) > > > - s3fwrn5_remove(phy->ndev); > > > + s3fwrn5_remove(phy->common.ndev); > > > > > > return ret; > > > } > > > @@ -264,7 +219,7 @@ static int s3fwrn5_i2c_remove(struct i2c_client *= client) > > > { > > > struct s3fwrn5_i2c_phy *phy =3D i2c_get_clientdata(client); > > > > > > - s3fwrn5_remove(phy->ndev); > > > + s3fwrn5_remove(phy->common.ndev); > > > > > > return 0; > > > } > > > diff --git a/drivers/nfc/s3fwrn5/phy_common.h b/drivers/nfc/s3fwrn5/p= hy_common.h > > > new file mode 100644 > > > index 0000000..14f7690 > > > --- /dev/null > > > +++ b/drivers/nfc/s3fwrn5/phy_common.h > > > @@ -0,0 +1,86 @@ > > > +/* SPDX-License-Identifier: GPL-2.0-or-later > > > + * > > > + * Link Layer for Samsung S3FWRN5 NCI based Driver > > > + * > > > + * Copyright (C) 2015 Samsung Electrnoics > > > + * Robert Baldyga > > > + * Copyright (C) 2020 Samsung Electrnoics > > > + * Bongsu Jeon > > > + */ > > > + > > > +#ifndef __LOCAL_PHY_COMMON_H > > > +#define __LOCAL_PHY_COMMON_H > > > > Header guard: __NFC_S3FWRN5_PHY_COMMON_H > > > > > + > > > +#include "s3fwrn5.h" > > > > This include should not be needed. > > > = > Actually, I included this because of enum s3fwrn5_mode. > Do you think the following structure is good? > = > 0. remove the '#include "s3fwrn5.h" and the common function's > definition in phy_common.h. > 1. make phy_common.c that includes the common function's definition > and "s3fwrn5.h , phy_common.h". > 2. i2c.c includes "s3fwrn5.h , phy_common.h". It looks like you already sent v2... I'll skip answering here then. Best regards, Krzysztof --===============5943936541548741153==-- From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============1453324569769768721==" MIME-Version: 1.0 From: Krzysztof Kozlowski To: linux-nfc@lists.01.org Subject: Re: [PATCH net-next 3/3] nfc: s3fwrn5: extract the common phy blocks Date: Sat, 28 Nov 2020 12:45:55 +0100 Message-ID: <20201128114555.GA6313@kozik-lap> In-Reply-To: List-Id: --===============1453324569769768721== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable On Fri, Nov 27, 2020 at 08:09:24AM +0900, Bongsu Jeon wrote: > On Fri, Nov 27, 2020 at 2:13 AM Krzysztof Kozlowski w= rote: > > > > On Fri, Nov 27, 2020 at 12:33:39AM +0900, bongsu.jeon2(a)gmail.com wrot= e: > > > From: Bongsu Jeon > > > > > > Extract the common phy blocks to reuse it. > > > The UART module will use the common blocks. > > > > > > Hi, > > > > Thanks for the patch. Few comments below. > > > > > Signed-off-by: Bongsu Jeon > > > --- > > > drivers/nfc/s3fwrn5/i2c.c | 111 ++++++++++++-----------------= ---------- > > > drivers/nfc/s3fwrn5/phy_common.h | 86 ++++++++++++++++++++++++++++++ > > > 2 files changed, 119 insertions(+), 78 deletions(-) > > > create mode 100644 drivers/nfc/s3fwrn5/phy_common.h > > > > > > diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c > > > index 9a64eea..cd1b2a7 100644 > > > --- a/drivers/nfc/s3fwrn5/i2c.c > > > +++ b/drivers/nfc/s3fwrn5/i2c.c > > > @@ -15,75 +15,30 @@ > > > > > > #include > > > > > > -#include "s3fwrn5.h" > > > +#include "phy_common.h" > > > > > > #define S3FWRN5_I2C_DRIVER_NAME "s3fwrn5_i2c" > > > > > > -#define S3FWRN5_EN_WAIT_TIME 20 > > > - > > > struct s3fwrn5_i2c_phy { > > > + struct phy_common common; > > > struct i2c_client *i2c_dev; > > > - struct nci_dev *ndev; > > > - > > > - int gpio_en; > > > - int gpio_fw_wake; > > > - > > > - struct mutex mutex; > > > > > > - enum s3fwrn5_mode mode; > > > unsigned int irq_skip:1; > > > }; > > > > > > -static void s3fwrn5_i2c_set_wake(void *phy_id, bool wake) > > > -{ > > > - struct s3fwrn5_i2c_phy *phy =3D phy_id; > > > - > > > - mutex_lock(&phy->mutex); > > > - gpio_set_value(phy->gpio_fw_wake, wake); > > > - msleep(S3FWRN5_EN_WAIT_TIME); > > > - mutex_unlock(&phy->mutex); > > > -} > > > - > > > static void s3fwrn5_i2c_set_mode(void *phy_id, enum s3fwrn5_mode mod= e) > > > { > > > struct s3fwrn5_i2c_phy *phy =3D phy_id; > > > > > > - mutex_lock(&phy->mutex); > > > + mutex_lock(&phy->common.mutex); > > > > > > - if (phy->mode =3D=3D mode) > > > + if (s3fwrn5_phy_power_ctrl(&phy->common, mode) =3D=3D false) > > > goto out; > > > > > > - phy->mode =3D mode; > > > - > > > - gpio_set_value(phy->gpio_en, 1); > > > - gpio_set_value(phy->gpio_fw_wake, 0); > > > - if (mode =3D=3D S3FWRN5_MODE_FW) > > > - gpio_set_value(phy->gpio_fw_wake, 1); > > > - > > > - if (mode !=3D S3FWRN5_MODE_COLD) { > > > - msleep(S3FWRN5_EN_WAIT_TIME); > > > - gpio_set_value(phy->gpio_en, 0); > > > - msleep(S3FWRN5_EN_WAIT_TIME); > > > - } > > > - > > > phy->irq_skip =3D true; > > > > > > out: > > > - mutex_unlock(&phy->mutex); > > > -} > > > - > > > -static enum s3fwrn5_mode s3fwrn5_i2c_get_mode(void *phy_id) > > > -{ > > > - struct s3fwrn5_i2c_phy *phy =3D phy_id; > > > - enum s3fwrn5_mode mode; > > > - > > > - mutex_lock(&phy->mutex); > > > - > > > - mode =3D phy->mode; > > > - > > > - mutex_unlock(&phy->mutex); > > > - > > > - return mode; > > > + mutex_unlock(&phy->common.mutex); > > > } > > > > > > static int s3fwrn5_i2c_write(void *phy_id, struct sk_buff *skb) > > > @@ -91,7 +46,7 @@ static int s3fwrn5_i2c_write(void *phy_id, struct s= k_buff *skb) > > > struct s3fwrn5_i2c_phy *phy =3D phy_id; > > > int ret; > > > > > > - mutex_lock(&phy->mutex); > > > + mutex_lock(&phy->common.mutex); > > > > > > phy->irq_skip =3D false; > > > > > > @@ -102,7 +57,7 @@ static int s3fwrn5_i2c_write(void *phy_id, struct = sk_buff *skb) > > > ret =3D i2c_master_send(phy->i2c_dev, skb->data, skb->= len); > > > } > > > > > > - mutex_unlock(&phy->mutex); > > > + mutex_unlock(&phy->common.mutex); > > > > > > if (ret < 0) > > > return ret; > > > @@ -114,9 +69,9 @@ static int s3fwrn5_i2c_write(void *phy_id, struct = sk_buff *skb) > > > } > > > > > > static const struct s3fwrn5_phy_ops i2c_phy_ops =3D { > > > - .set_wake =3D s3fwrn5_i2c_set_wake, > > > + .set_wake =3D s3fwrn5_phy_set_wake, > > > .set_mode =3D s3fwrn5_i2c_set_mode, > > > - .get_mode =3D s3fwrn5_i2c_get_mode, > > > + .get_mode =3D s3fwrn5_phy_get_mode, > > > .write =3D s3fwrn5_i2c_write, > > > }; > > > > > > @@ -128,7 +83,7 @@ static int s3fwrn5_i2c_read(struct s3fwrn5_i2c_phy= *phy) > > > char hdr[4]; > > > int ret; > > > > > > - hdr_size =3D (phy->mode =3D=3D S3FWRN5_MODE_NCI) ? > > > + hdr_size =3D (phy->common.mode =3D=3D S3FWRN5_MODE_NCI) ? > > > NCI_CTRL_HDR_SIZE : S3FWRN5_FW_HDR_SIZE; > > > ret =3D i2c_master_recv(phy->i2c_dev, hdr, hdr_size); > > > if (ret < 0) > > > @@ -137,7 +92,7 @@ static int s3fwrn5_i2c_read(struct s3fwrn5_i2c_phy= *phy) > > > if (ret < hdr_size) > > > return -EBADMSG; > > > > > > - data_len =3D (phy->mode =3D=3D S3FWRN5_MODE_NCI) ? > > > + data_len =3D (phy->common.mode =3D=3D S3FWRN5_MODE_NCI) ? > > > ((struct nci_ctrl_hdr *)hdr)->plen : > > > ((struct s3fwrn5_fw_header *)hdr)->len; > > > > > > @@ -157,24 +112,24 @@ static int s3fwrn5_i2c_read(struct s3fwrn5_i2c_= phy *phy) > > > } > > > > > > out: > > > - return s3fwrn5_recv_frame(phy->ndev, skb, phy->mode); > > > + return s3fwrn5_recv_frame(phy->common.ndev, skb, phy->common.mo= de); > > > } > > > > > > static irqreturn_t s3fwrn5_i2c_irq_thread_fn(int irq, void *phy_id) > > > { > > > struct s3fwrn5_i2c_phy *phy =3D phy_id; > > > > > > - if (!phy || !phy->ndev) { > > > + if (!phy || !phy->common.ndev) { > > > WARN_ON_ONCE(1); > > > return IRQ_NONE; > > > } > > > > > > - mutex_lock(&phy->mutex); > > > + mutex_lock(&phy->common.mutex); > > > > > > if (phy->irq_skip) > > > goto out; > > > > > > - switch (phy->mode) { > > > + switch (phy->common.mode) { > > > case S3FWRN5_MODE_NCI: > > > case S3FWRN5_MODE_FW: > > > s3fwrn5_i2c_read(phy); > > > @@ -184,7 +139,7 @@ static irqreturn_t s3fwrn5_i2c_irq_thread_fn(int = irq, void *phy_id) > > > } > > > > > > out: > > > - mutex_unlock(&phy->mutex); > > > + mutex_unlock(&phy->common.mutex); > > > > > > return IRQ_HANDLED; > > > } > > > @@ -197,19 +152,19 @@ static int s3fwrn5_i2c_parse_dt(struct i2c_clie= nt *client) > > > if (!np) > > > return -ENODEV; > > > > > > - phy->gpio_en =3D of_get_named_gpio(np, "en-gpios", 0); > > > - if (!gpio_is_valid(phy->gpio_en)) { > > > + phy->common.gpio_en =3D of_get_named_gpio(np, "en-gpios", 0); > > > + if (!gpio_is_valid(phy->common.gpio_en)) { > > > /* Support also deprecated property */ > > > - phy->gpio_en =3D of_get_named_gpio(np, "s3fwrn5,en-gpio= s", 0); > > > - if (!gpio_is_valid(phy->gpio_en)) > > > + phy->common.gpio_en =3D of_get_named_gpio(np, "s3fwrn5,= en-gpios", 0); > > > + if (!gpio_is_valid(phy->common.gpio_en)) > > > return -ENODEV; > > > } > > > > > > - phy->gpio_fw_wake =3D of_get_named_gpio(np, "wake-gpios", 0); > > > - if (!gpio_is_valid(phy->gpio_fw_wake)) { > > > + phy->common.gpio_fw_wake =3D of_get_named_gpio(np, "wake-gpios"= , 0); > > > + if (!gpio_is_valid(phy->common.gpio_fw_wake)) { > > > /* Support also deprecated property */ > > > - phy->gpio_fw_wake =3D of_get_named_gpio(np, "s3fwrn5,fw= -gpios", 0); > > > - if (!gpio_is_valid(phy->gpio_fw_wake)) > > > + phy->common.gpio_fw_wake =3D of_get_named_gpio(np, "s3f= wrn5,fw-gpios", 0); > > > > The lines here should wrap at 80 character. > > > > > + if (!gpio_is_valid(phy->common.gpio_fw_wake)) > > > return -ENODEV; > > > } > > > > > > @@ -226,8 +181,8 @@ static int s3fwrn5_i2c_probe(struct i2c_client *c= lient, > > > if (!phy) > > > return -ENOMEM; > > > > > > - mutex_init(&phy->mutex); > > > - phy->mode =3D S3FWRN5_MODE_COLD; > > > + mutex_init(&phy->common.mutex); > > > + phy->common.mode =3D S3FWRN5_MODE_COLD; > > > phy->irq_skip =3D true; > > > > > > phy->i2c_dev =3D client; > > > @@ -237,17 +192,17 @@ static int s3fwrn5_i2c_probe(struct i2c_client = *client, > > > if (ret < 0) > > > return ret; > > > > > > - ret =3D devm_gpio_request_one(&phy->i2c_dev->dev, phy->gpio_en, > > > - GPIOF_OUT_INIT_HIGH, "s3fwrn5_en"); > > > + ret =3D devm_gpio_request_one(&phy->i2c_dev->dev, phy->common.g= pio_en, > > > + GPIOF_OUT_INIT_HIGH, "s3fwrn5_en"); > > > if (ret < 0) > > > return ret; > > > > > > - ret =3D devm_gpio_request_one(&phy->i2c_dev->dev, phy->gpio_fw_= wake, > > > - GPIOF_OUT_INIT_LOW, "s3fwrn5_fw_wake"); > > > + ret =3D devm_gpio_request_one(&phy->i2c_dev->dev, phy->common.g= pio_fw_wake, > > > + GPIOF_OUT_INIT_LOW, "s3fwrn5_fw_wak= e"); > > > if (ret < 0) > > > return ret; > > > > > > - ret =3D s3fwrn5_probe(&phy->ndev, phy, &phy->i2c_dev->dev, &i2c= _phy_ops); > > > + ret =3D s3fwrn5_probe(&phy->common.ndev, phy, &phy->i2c_dev->de= v, &i2c_phy_ops); > > > > Please wrap the lines. > > > > > if (ret < 0) > > > return ret; > > > > > > @@ -255,7 +210,7 @@ static int s3fwrn5_i2c_probe(struct i2c_client *c= lient, > > > s3fwrn5_i2c_irq_thread_fn, IRQF_TRIGGER_HIGH | IRQF_ONE= SHOT, > > > S3FWRN5_I2C_DRIVER_NAME, phy); > > > if (ret) > > > - s3fwrn5_remove(phy->ndev); > > > + s3fwrn5_remove(phy->common.ndev); > > > > > > return ret; > > > } > > > @@ -264,7 +219,7 @@ static int s3fwrn5_i2c_remove(struct i2c_client *= client) > > > { > > > struct s3fwrn5_i2c_phy *phy =3D i2c_get_clientdata(client); > > > > > > - s3fwrn5_remove(phy->ndev); > > > + s3fwrn5_remove(phy->common.ndev); > > > > > > return 0; > > > } > > > diff --git a/drivers/nfc/s3fwrn5/phy_common.h b/drivers/nfc/s3fwrn5/p= hy_common.h > > > new file mode 100644 > > > index 0000000..14f7690 > > > --- /dev/null > > > +++ b/drivers/nfc/s3fwrn5/phy_common.h > > > @@ -0,0 +1,86 @@ > > > +/* SPDX-License-Identifier: GPL-2.0-or-later > > > + * > > > + * Link Layer for Samsung S3FWRN5 NCI based Driver > > > + * > > > + * Copyright (C) 2015 Samsung Electrnoics > > > + * Robert Baldyga > > > + * Copyright (C) 2020 Samsung Electrnoics > > > + * Bongsu Jeon > > > + */ > > > + > > > +#ifndef __LOCAL_PHY_COMMON_H > > > +#define __LOCAL_PHY_COMMON_H > > > > Header guard: __NFC_S3FWRN5_PHY_COMMON_H > > > > > + > > > +#include "s3fwrn5.h" > > > > This include should not be needed. > > > = > Actually, I included this because of enum s3fwrn5_mode. > Do you think the following structure is good? > = > 0. remove the '#include "s3fwrn5.h" and the common function's > definition in phy_common.h. > 1. make phy_common.c that includes the common function's definition > and "s3fwrn5.h , phy_common.h". > 2. i2c.c includes "s3fwrn5.h , phy_common.h". It looks like you already sent v2... I'll skip answering here then. Best regards, Krzysztof --===============1453324569769768721==--