Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Avri Altman <Avri.Altman@wdc.com>
To:     Tomas Winkler <tomas.winkler@intel.com>,
        "James E . J . Bottomley" <jejb@linux.vnet.ibm.com>,
        "Martin K . Petersen" <martin.petersen@oracle.com>,
        Vinayak Holikatti <vinholikatti@gmail.com>,
        Adrian Hunter <adrian.hunter@intel.com>
CC:     Christoph Hellwig <hch@lst.de>,
        Vivek Gautam <vivek.gautam@codeaurora.org>,
        Subhash Jadavani <subhashj@codeaurora.org>,
        Alex Lemberg <Alex.Lemberg@wdc.com>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH resend] scsi: ufs: ufshcd_dump_regs to use memcpy_fromio
Thread-Topic: [PATCH resend] scsi: ufs: ufshcd_dump_regs to use memcpy_fromio
Thread-Index: AQHUA7fRqO2gDjlBOUK3bq+8qjLxhaRf1OMA
Date:   Thu, 14 Jun 2018 14:48:31 +0000
Message-ID: <DM5PR04MB10851A8650A68E5FD1229227FC7D0@DM5PR04MB1085.namprd04.prod.outlook.com>
References: <20180614081409.29780-1-tomas.winkler@intel.com>
In-Reply-To: <20180614081409.29780-1-tomas.winkler@intel.com>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 854116f3-532c-437c-2ea2-08d5d205e5c5
X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jun 2018 14:48:31.3586
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR04MB0458
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Tomas Winkler <tomas.winkler@intel.com>
> Sent: Thursday, June 14, 2018 11:14 AM
> To: James E . J . Bottomley <jejb@linux.vnet.ibm.com>; Martin K . Peterse=
n
> <martin.petersen@oracle.com>; Vinayak Holikatti
> <vinholikatti@gmail.com>; Adrian Hunter <adrian.hunter@intel.com>
> Cc: Christoph Hellwig <hch@lst.de>; Vivek Gautam
> <vivek.gautam@codeaurora.org>; Subhash Jadavani
> <subhashj@codeaurora.org>; Alex Lemberg <Alex.Lemberg@wdc.com>; Avri
> Altman <Avri.Altman@wdc.com>; linux-scsi@vger.kernel.org; linux-
> kernel@vger.kernel.org; Tomas Winkler <tomas.winkler@intel.com>
> Subject: [PATCH resend] scsi: ufs: ufshcd_dump_regs to use memcpy_fromio
>=20
> ufshcd_dump_regs should use memcpy_fromio to read host registers instead
> of directly accessing using memcpy.
> The same function is utilized in ufs-qcom.
>=20
> Elminite compilation warning
> drivers/scsi/ufs/ufshcd.c:356:9: warning: incorrect type in argument 6
> (different address spaces)
> drivers/scsi/ufs/ufshcd.c:356:9:    expected void const *buf
> drivers/scsi/ufs/ufshcd.c:356:9:    got void [noderef] <asn:2>*mmio_base
>=20
> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Reviewed-by: Avri Altman <avri.altman@wdc.com>

> ---
>  drivers/scsi/ufs/ufs-qcom.c | 21 ++++++---------------
>  drivers/scsi/ufs/ufshcd.c   | 35 ++++++++++++++++++++++++-----------
>  drivers/scsi/ufs/ufshcd.h   |  3 +++
>  3 files changed, 33 insertions(+), 26 deletions(-)
>=20
> diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c in=
dex
> 2b38db2eeafa..77ac98ea80d4 100644
> --- a/drivers/scsi/ufs/ufs-qcom.c
> +++ b/drivers/scsi/ufs/ufs-qcom.c
> @@ -50,19 +50,10 @@ static void ufs_qcom_get_default_testbus_cfg(struct
> ufs_qcom_host *host);  static int
> ufs_qcom_set_dme_vs_core_clk_ctrl_clear_div(struct ufs_hba *hba,
>  						       u32 clk_cycles);
>=20
> -static void ufs_qcom_dump_regs(struct ufs_hba *hba, int offset, int len,
> -		char *prefix)
> -{
> -	print_hex_dump(KERN_ERR, prefix,
> -			len > 4 ? DUMP_PREFIX_OFFSET :
> DUMP_PREFIX_NONE,
> -			16, 4, (void __force *)hba->mmio_base + offset,
> -			len * 4, false);
> -}
> -
>  static void ufs_qcom_dump_regs_wrapper(struct ufs_hba *hba, int offset,
> int len,
> -		char *prefix, void *priv)
> +				       const char *prefix, void *priv)
>  {
> -	ufs_qcom_dump_regs(hba, offset, len, prefix);
> +	ufshcd_dump_regs(hba, offset, len * 4, prefix);
>  }
>=20
>  static int ufs_qcom_get_connected_tx_lanes(struct ufs_hba *hba, u32
> *tx_lanes) @@ -1431,7 +1422,7 @@ static int
> ufs_qcom_clk_scale_notify(struct ufs_hba *hba,
>=20
>  static void ufs_qcom_print_hw_debug_reg_all(struct ufs_hba *hba,
>  		void *priv, void (*print_fn)(struct ufs_hba *hba,
> -		int offset, int num_regs, char *str, void *priv))
> +		int offset, int num_regs, const char *str, void *priv))
>  {
>  	u32 reg;
>  	struct ufs_qcom_host *host;
> @@ -1613,7 +1604,7 @@ int ufs_qcom_testbus_config(struct
> ufs_qcom_host *host)
>=20
>  static void ufs_qcom_testbus_read(struct ufs_hba *hba)  {
> -	ufs_qcom_dump_regs(hba, UFS_TEST_BUS, 1, "UFS_TEST_BUS ");
> +	ufshcd_dump_regs(hba, UFS_TEST_BUS, 4, "UFS_TEST_BUS ");
>  }
>=20
>  static void ufs_qcom_print_unipro_testbus(struct ufs_hba *hba) @@ -
> 1639,8 +1630,8 @@ static void ufs_qcom_print_unipro_testbus(struct
> ufs_hba *hba)
>=20
>  static void ufs_qcom_dump_dbg_regs(struct ufs_hba *hba)  {
> -	ufs_qcom_dump_regs(hba, REG_UFS_SYS1CLK_1US, 16,
> -			"HCI Vendor Specific Registers ");
> +	ufshcd_dump_regs(hba, REG_UFS_SYS1CLK_1US, 16 * 4,
> +			 "HCI Vendor Specific Registers ");
>=20
>  	/* sleep a bit intermittently as we are dumping too much data */
>  	ufs_qcom_print_hw_debug_reg_all(hba, NULL,
> ufs_qcom_dump_regs_wrapper); diff --git a/drivers/scsi/ufs/ufshcd.c
> b/drivers/scsi/ufs/ufshcd.c index d0a1674915a1..972fa85e2b24 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -99,8 +99,29 @@
>  		_ret;                                                   \
>  	})
>=20
> -#define ufshcd_hex_dump(prefix_str, buf, len) \ -
> print_hex_dump(KERN_ERR, prefix_str, DUMP_PREFIX_OFFSET, 16, 4, buf,
> len, false)
> +#define ufshcd_hex_dump(prefix_str, buf, len) do {                      =
 \
> +	size_t __len =3D (len);                                            \
> +	print_hex_dump(KERN_ERR, prefix_str,                             \
> +		       __len > 4 ? DUMP_PREFIX_OFFSET :
> DUMP_PREFIX_NONE,\
> +		       16, 4, buf, __len, false);                        \
> +} while (0)
> +
> +int ufshcd_dump_regs(struct ufs_hba *hba, size_t offset, size_t len,
> +		     const char *prefix)
> +{
> +	u8 *regs;
> +
> +	regs =3D kzalloc(len, GFP_KERNEL);
> +	if (!regs)
> +		return -ENOMEM;
> +
> +	memcpy_fromio(regs, hba->mmio_base + offset, len);
> +	ufshcd_hex_dump(prefix, regs, len);
> +	kfree(regs);
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(ufshcd_dump_regs);
>=20
>  enum {
>  	UFSHCD_MAX_CHANNEL	=3D 0,
> @@ -376,15 +397,7 @@ static void ufshcd_print_uic_err_hist(struct ufs_hba
> *hba,
>=20
>  static void ufshcd_print_host_regs(struct ufs_hba *hba)  {
> -	/*
> -	 * hex_dump reads its data without the readl macro. This might
> -	 * cause inconsistency issues on some platform, as the printed
> -	 * values may be from cache and not the most recent value.
> -	 * To know whether you are looking at an un-cached version verify
> -	 * that IORESOURCE_MEM flag is on when xxx_get_resource() is
> invoked
> -	 * during platform/pci probe function.
> -	 */
> -	ufshcd_hex_dump("host regs: ", hba->mmio_base,
> UFSHCI_REG_SPACE_SIZE);
> +	ufshcd_dump_regs(hba, 0, UFSHCI_REG_SPACE_SIZE, "host_regs: ");
>  	dev_err(hba->dev, "hba->ufs_version =3D 0x%x, hba->capabilities =3D
> 0x%x\n",
>  		hba->ufs_version, hba->capabilities);
>  	dev_err(hba->dev,
> diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h index
> 8110dcd04d22..aad959ba3d9b 100644
> --- a/drivers/scsi/ufs/ufshcd.h
> +++ b/drivers/scsi/ufs/ufshcd.h
> @@ -1022,4 +1022,7 @@ static inline u8 ufshcd_scsi_to_upiu_lun(unsigned
> int scsi_lun)
>  		return scsi_lun & UFS_UPIU_MAX_UNIT_NUM_ID;  }
>=20
> +int ufshcd_dump_regs(struct ufs_hba *hba, size_t offset, size_t len,
> +		     const char *prefix);
> +
>  #endif /* End of Header */
> --
> 2.14.4