Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Jose Abreu <Jose.Abreu@synopsys.com>
To:     "Winkler, Tomas" <tomas.winkler@intel.com>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>
CC:     Joao Pinto <Joao.Pinto@synopsys.com>,
        Joao Lima <Joao.Lima@synopsys.com>,
        "Alim Akhtar" <alim.akhtar@samsung.com>,
        Avri Altman <avri.altman@wdc.com>,
        "James E.J. Bottomley" <jejb@linux.ibm.com>,
        "Martin K. Petersen" <martin.petersen@oracle.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH 3/5] scsi: ufs: tc-dwc-pci: Use PDI ID to match Test Chip
 type
Thread-Topic: [PATCH 3/5] scsi: ufs: tc-dwc-pci: Use PDI ID to match Test Chip
 type
Thread-Index: AQHWGizL85eiXEn8NkKQ2LMZaAyhmKiIK5CAgAAAxWA=
Date:   Fri, 24 Apr 2020 12:08:11 +0000
Message-ID: <BN8PR12MB32662BD6478A0FCF0F29353AD3D00@BN8PR12MB3266.namprd12.prod.outlook.com>
References: <cover.1587727756.git.Jose.Abreu@synopsys.com>
 <8427c06b92bae656ab3ef75c7edc980900cdf075.1587727756.git.Jose.Abreu@synopsys.com>
 <a0656591acea47e2b6765d2411f0a362@intel.com>
In-Reply-To: <a0656591acea47e2b6765d2411f0a362@intel.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: synopsys.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 971e6b69-78f9-4264-74ef-08d7e84828d3
X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Apr 2020 12:08:11.4851
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: c33c9f88-1eb7-4099-9700-16013fd9e8aa
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 3frypppl85qKLuyWplI/bjuLzCoNF/OYSwx6AVVQF/lxCu2qi+uabWZ3IPsZi0yEMngp9/du4nY9pEmPaCOYWg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB2978
X-OriginatorOrg: synopsys.com
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Winkler, Tomas <tomas.winkler@intel.com>
Date: Apr/24/2020, 13:00:33 (UTC+00:00)

> >=20
> > In preparation for the addition of new Test Chips, we re-arrange the
> > initialization sequence so that we rely on PCI ID to match for given Te=
st Chip
> > type.
> >=20
> > Signed-off-by: Jose Abreu <Jose.Abreu@synopsys.com>
> >=20
> > ---
> > Cc: Joao Lima <Joao.Lima@synopsys.com>
> > Cc: Jose Abreu <Jose.Abreu@synopsys.com>
> > Cc: Alim Akhtar <alim.akhtar@samsung.com>
> > Cc: Avri Altman <avri.altman@wdc.com>
> > Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
> > Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
> > Cc: linux-scsi@vger.kernel.org
> > Cc: linux-kernel@vger.kernel.org
> > ---
> >  drivers/scsi/ufs/tc-dwc-pci.c | 68 ++++++++++++++++++++++++++++-------=
----
> > ----
> >  1 file changed, 44 insertions(+), 24 deletions(-)
> >=20
> > diff --git a/drivers/scsi/ufs/tc-dwc-pci.c b/drivers/scsi/ufs/tc-dwc-pc=
i.c index
> > aeb11f7f0c91..74a2d80d32bd 100644
> > --- a/drivers/scsi/ufs/tc-dwc-pci.c
> > +++ b/drivers/scsi/ufs/tc-dwc-pci.c
> > @@ -14,6 +14,11 @@
> >  #include <linux/pci.h>
> >  #include <linux/pm_runtime.h>
> >=20
> > +struct tc_dwc_data {
> > +	struct ufs_hba_variant_ops ops;
> > +	int (*setup)(struct pci_dev *pdev, struct tc_dwc_data *data); };
> > +
> >  /* Test Chip type expected values */
> >  #define TC_G210_20BIT 20
> >  #define TC_G210_40BIT 40
> > @@ -23,6 +28,20 @@ static int tc_type =3D TC_G210_INV;
> > module_param(tc_type, int, 0);  MODULE_PARM_DESC(tc_type, "Test Chip
> > Type (20 =3D 20-bit, 40 =3D 40-bit)");
> >=20
> > +static int tc_dwc_g210_set_config(struct pci_dev *pdev, struct
> > +tc_dwc_data *data) {
> > +	if (tc_type =3D=3D TC_G210_20BIT) {
> > +		data->ops.phy_initialization =3D tc_dwc_g210_config_20_bit;
> > +	} else if (tc_type =3D=3D TC_G210_40BIT) {
> > +		data->ops.phy_initialization =3D tc_dwc_g210_config_40_bit;
> > +	} else {
> > +		dev_err(&pdev->dev, "test chip version not specified\n");
> > +		return -EPERM;
> > +	}
> > +
> > +	return 0;
> > +}
> > +
> >  static int tc_dwc_pci_suspend(struct device *dev)  {
> >  	return ufshcd_system_suspend(dev_get_drvdata(dev));
> > @@ -48,14 +67,6 @@ static int tc_dwc_pci_runtime_idle(struct device *de=
v)
> >  	return ufshcd_runtime_idle(dev_get_drvdata(dev));
> >  }
> >=20
> > -/*
> > - * struct ufs_hba_dwc_vops - UFS DWC specific variant operations
> > - */
> > -static struct ufs_hba_variant_ops tc_dwc_pci_hba_vops =3D {
> > -	.name                   =3D "tc-dwc-pci",
> > -	.link_startup_notify	=3D ufshcd_dwc_link_startup_notify,
> > -};
> > -
> >  /**
> >   * tc_dwc_pci_shutdown - main function to put the controller in reset =
state
> >   * @pdev: pointer to PCI device handle
> > @@ -89,22 +100,11 @@ static void tc_dwc_pci_remove(struct pci_dev *pdev=
)
> > static int  tc_dwc_pci_probe(struct pci_dev *pdev, const struct pci_dev=
ice_id
> > *id)  {
> > -	struct ufs_hba *hba;
> > +	struct tc_dwc_data *data =3D (struct tc_dwc_data *)id->driver_data;
> >  	void __iomem *mmio_base;
> > +	struct ufs_hba *hba;
> >  	int err;
> >=20
> > -	/* Check Test Chip type and set the specific setup routine */
> > -	if (tc_type =3D=3D TC_G210_20BIT) {
> > -		tc_dwc_pci_hba_vops.phy_initialization =3D
> > -						tc_dwc_g210_config_20_bit;
> > -	} else if (tc_type =3D=3D TC_G210_40BIT) {
> > -		tc_dwc_pci_hba_vops.phy_initialization =3D
> > -						tc_dwc_g210_config_40_bit;
> > -	} else {
> > -		dev_err(&pdev->dev, "test chip version not specified\n");
> > -		return -EPERM;
> > -	}
> > -
> >  	err =3D pcim_enable_device(pdev);
> >  	if (err) {
> >  		dev_err(&pdev->dev, "pcim_enable_device failed\n"); @@ -
> > 127,7 +127,16 @@ tc_dwc_pci_probe(struct pci_dev *pdev, const struct
> > pci_device_id *id)
> >  		return err;
> >  	}
> >=20
> > -	hba->vops =3D &tc_dwc_pci_hba_vops;
> > +	/* Check Test Chip type and set the specific setup routine */
> > +	if (data && data->setup) {
> > +		err =3D data->setup(pdev, data);
> > +		if (err)
> > +			return err;
> > +	} else {
> > +		return -ENOENT;
> > +	}
> > +
> > +	hba->vops =3D &data->ops;
> >=20
> >  	err =3D ufshcd_init(hba, mmio_base, pdev->irq);
> >  	if (err) {
> > @@ -150,9 +159,20 @@ static const struct dev_pm_ops tc_dwc_pci_pm_ops
> > =3D {
> >  	.runtime_idle    =3D tc_dwc_pci_runtime_idle,
> >  };
> >=20
> > +static struct tc_dwc_data tc_dwc_g210_data =3D {
>=20
> Constify the struct, if possible.=20

Actually, I can't because I overwrite one of the ops callback in the=20
probe() depending on TC specified.

---
Thanks,
Jose Miguel Abreu