From nobody Sun Feb 8 17:04:13 2026 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4935228CB7; Fri, 10 Jan 2025 18:42:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736534564; cv=none; b=fzQovDbYk0pd46gRX3vYP7+/ewQFyI2d1qOrtUnXdGo2BowKb5Z00ewpPMyfINkLBTR7ppjnbmdfr/KWF6apKcSQq1EW02hPJC2gUSuNxULknohUbSoNzACPYsjKpE8/VhntKEka//UL+1iJgy71J9pEIL/tiFhFtN2ZU64/KJs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736534564; c=relaxed/simple; bh=6VbptkTBrkj2B/A9b9I8WzVTHZriybWDzQEBGb8UuQE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rK9DUZwBfQnrY6O/nyY6+foz8ZqZn0Lvb6lmN8f9fsGWX0QUrVY1atJ1waGe3dbigePKtlD3O6VQUqzNa6xGgIdq2758Fnp0+8T1/ISyabjHBcK1Vcg6sARW5WgqJrVuhL+Rh32yBU+hf5gozOHcJdEYTHBuGkC8pFp+rkMYC5k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=VjNdvfOZ; arc=none smtp.client-ip=217.70.183.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="VjNdvfOZ" Received: by mail.gandi.net (Postfix) with ESMTPSA id 6C9D31C0003; Fri, 10 Jan 2025 18:42:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1736534533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4UMNFcJb9aadD6WZurG43mAWrjEyERkYqfGw24VQjik=; b=VjNdvfOZ+S3jZO6KvZ3PIsID/pBsC8eyY+x+jJ+vyPzeoyrwEPDvhjUmNSHOXWHtz9SVBP rNfp5xAtAISTa4t6UPTK+3v/+m0zM++RXN9/FooIKAJAzwdv40GrDN1PstPSNSnDjQkJPO IcaXt65TwOxNYOJeJwViFLzHnSfdIV1PWAiTpQXmArchJ840stl1QMVJW+YZPfcv5RxVAR WO13wQo+SAY+CBPdh12ZDWHNoq5gBjBnL/ZEYwmzHmGxm6JPupwhhAhM8WhC0Is/+cVrKs szt5BuRvqMu1HxpIHqaD2IRVcnvhmvxixXN2/4L+nIW/tHLO1X0aQb5jIF2fsQ== From: Miquel Raynal Date: Fri, 10 Jan 2025 19:42:04 +0100 Subject: [PATCH v2 1/2] hexdump: Convert the ascii boolean into a flag variable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250110-perso-hexdump-v2-1-7f9a6a799170@bootlin.com> References: <20250110-perso-hexdump-v2-0-7f9a6a799170@bootlin.com> In-Reply-To: <20250110-perso-hexdump-v2-0-7f9a6a799170@bootlin.com> To: Petr Mladek , Steven Rostedt , Rasmus Villemoes , Sergey Senozhatsky , Jonathan Corbet , John Ogness , Andrew Morton Cc: Andy Shevchenko , Thomas Petazzoni , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Miquel Raynal X-Mailer: b4 0.15-dev X-GND-Sasl: miquel.raynal@bootlin.com The print_hex_dump() prototype is already quite long and there are already several hundred in-tree users. One argument is a boolean for enabling the ascii output. This is one way to format the buffer. We could think of other ways, which in this case might need other booleans to be enabled. In order to avoid messing several times with the prototype (and all the callers), let's switch to a 'flags' variable which can be easily extended. There is no behavioral change intended. Signed-off-by: Miquel Raynal --- I tried to play with Coccinelle for the first time in order to address the 600+ occurences of print_hex_dump, print_hex_dump_debug and dynamic_hex_dump. I believe I managed to handle most of the cases (compared using git grep) except several places enclosed inside comments, '#if 0' and macros. I did not find an actual reason why the kernel configuration would have an impact but apparently it did. I didn't find advanced (and readable) resources on the Internet to fix that, so here is the script. Nevertheless, it's a great and powerful tool. @@ expression E; @@ ( print_hex_dump | print_hex_dump_debug | dynamic_hex_dump ) (E,..., ( - true + DUMP_FLAG_ASCII | - 1 + DUMP_FLAG_ASCII | - false + 0 ) ); --- arch/um/include/shared/user.h | 4 +- arch/x86/kernel/mpparse.c | 4 +- arch/x86/kvm/svm/sev.c | 2 +- arch/xtensa/kernel/traps.c | 4 +- crypto/ansi_cprng.c | 2 +- crypto/testmgr.c | 2 +- drivers/acpi/nfit/core.c | 8 +- drivers/ata/libata-core.c | 4 +- drivers/ata/pata_parport/bpck.c | 2 +- drivers/block/floppy.c | 4 +- drivers/cdx/controller/mcdi.c | 8 +- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 6 +- drivers/crypto/axis/artpec6_crypto.c | 4 +- drivers/crypto/bcm/util.c | 2 +- drivers/crypto/bcm/util.h | 4 +- drivers/crypto/caam/blob_gen.c | 6 +- drivers/crypto/caam/caamalg.c | 59 +++++----- drivers/crypto/caam/caamalg_desc.c | 32 ++--- drivers/crypto/caam/caamalg_qi.c | 30 +++-- drivers/crypto/caam/caamalg_qi2.c | 104 +++++++---------- drivers/crypto/caam/caamhash.c | 129 ++++++++---------= ---- drivers/crypto/caam/caampkc.c | 2 +- drivers/crypto/caam/caamprng.c | 4 +- drivers/crypto/caam/caamrng.c | 4 +- drivers/crypto/caam/error.c | 4 +- drivers/crypto/caam/key_gen.c | 14 +-- drivers/crypto/caam/sg_sw_sec4.h | 4 +- drivers/crypto/ccp/platform-access.c | 4 +- drivers/crypto/ccp/psp-dev.c | 4 +- drivers/crypto/ccp/sev-dev.c | 4 +- drivers/crypto/ccree/cc_driver.c | 2 +- .../crypto/intel/qat/qat_common/adf_mstate_mgr.c | 4 +- drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c | 8 +- .../crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c | 8 +- drivers/crypto/sa2ul.c | 2 +- drivers/dma/loongson1-apb-dma.c | 2 +- drivers/firmware/efi/apple-properties.c | 10 +- drivers/firmware/efi/cper-arm.c | 2 +- drivers/firmware/efi/cper.c | 4 +- drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 4 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 3 +- drivers/gpu/drm/display/drm_dp_mst_topology.c | 4 +- drivers/gpu/drm/drm_edid.c | 2 +- .../gpu/drm/i915/display/intel_crtc_state_dump.c | 2 +- drivers/gpu/drm/i915/display/intel_display.c | 4 +- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 4 +- drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 2 +- drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 2 +- drivers/hv/channel_mgmt.c | 11 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 3 +- drivers/infiniband/hw/irdma/cm.c | 6 +- drivers/infiniband/hw/irdma/ctrl.c | 104 ++++++++--------- drivers/infiniband/hw/irdma/puda.c | 28 ++--- drivers/infiniband/hw/irdma/uda.c | 6 +- drivers/infiniband/hw/mlx5/cq.c | 2 +- drivers/infiniband/ulp/srp/ib_srp.c | 2 +- drivers/input/touchscreen/melfas_mip4.c | 17 ++- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c | 21 ++-- drivers/macintosh/via-cuda.c | 2 +- drivers/macintosh/windfarm_smu_sat.c | 4 +- drivers/mailbox/imx-mailbox.c | 4 +- drivers/media/common/tveeprom.c | 2 +- drivers/media/dvb-core/dvb_net.c | 2 +- drivers/media/firewire/firedtv-avc.c | 4 +- drivers/media/pci/saa7164/saa7164-api.c | 8 +- drivers/media/pci/saa7164/saa7164-core.c | 4 +- drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 2 +- drivers/media/platform/qcom/venus/hfi_venus.c | 2 +- drivers/media/platform/ti/cal/cal.c | 5 +- drivers/media/usb/em28xx/em28xx-i2c.c | 2 +- drivers/mfd/rave-sp.c | 4 +- drivers/misc/genwqe/genwqe_driver.h | 2 +- drivers/mtd/tests/mtd_nandecctest.c | 8 +- drivers/mtd/ubi/debug.c | 6 +- drivers/mtd/ubi/debug.h | 2 +- drivers/mtd/ubi/io.c | 6 +- drivers/net/arcnet/arcnet.c | 4 +- drivers/net/can/usb/etas_es58x/es58x_core.c | 4 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- drivers/net/can/usb/ucan.c | 10 +- drivers/net/ethernet/aeroflex/greth.c | 7 +- drivers/net/ethernet/altera/altera_tse_main.c | 2 +- drivers/net/ethernet/amd/a2065.c | 2 +- drivers/net/ethernet/amd/ariadne.c | 2 +- drivers/net/ethernet/amd/pds_core/adminq.c | 4 +- drivers/net/ethernet/cadence/macb_main.c | 6 +- drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 +- drivers/net/ethernet/intel/e1000e/netdev.c | 6 +- drivers/net/ethernet/intel/i40e/i40e_common.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 25 ++-- drivers/net/ethernet/intel/iavf/iavf_common.c | 2 +- drivers/net/ethernet/intel/ice/ice_osdep.h | 4 +- drivers/net/ethernet/intel/igb/igb_main.c | 18 ++- drivers/net/ethernet/intel/igc/igc_dump.c | 10 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 +- drivers/net/ethernet/mellanox/mlx4/en_tx.c | 5 +- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c | 2 +- .../mellanox/mlx5/core/steering/hws/send.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/wq.c | 2 +- drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c | 2 +- drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 2 +- drivers/net/ethernet/microchip/enc28j60.c | 2 +- drivers/net/ethernet/pensando/ionic/ionic_main.c | 6 +- .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_ll2.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- drivers/net/ethernet/realtek/8139too.c | 2 +- drivers/net/ethernet/smsc/smc9194.c | 2 +- drivers/net/ethernet/vertexcom/mse102x.c | 2 +- drivers/net/fddi/skfp/skfddi.c | 2 +- drivers/net/phy/sfp.c | 8 +- drivers/net/tun.c | 3 +- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 2 +- drivers/net/wireless/ath/wil6210/cfg80211.c | 2 +- drivers/net/wireless/ath/wil6210/ethtool.c | 2 +- drivers/net/wireless/ath/wil6210/fw_inc.c | 3 +- drivers/net/wireless/ath/wil6210/txrx_edma.c | 4 +- drivers/net/wireless/ath/wil6210/wil6210.h | 9 +- drivers/net/wireless/ath/wil6210/wmi.c | 2 +- drivers/net/wireless/broadcom/b43/main.c | 2 +- drivers/net/wireless/intel/iwlegacy/common.h | 6 +- drivers/net/wireless/intel/iwlwifi/iwl-debug.h | 6 +- drivers/net/wireless/marvell/mwifiex/main.h | 2 +- drivers/net/wireless/realtek/rtl8xxxu/core.c | 4 +- drivers/net/wireless/realtek/rtw88/rtw8723x.c | 2 +- drivers/net/wireless/realtek/rtw88/rtw88xxa.c | 2 +- drivers/net/wireless/silabs/wfx/bh.c | 2 +- drivers/net/wireless/silabs/wfx/hif_rx.c | 4 +- drivers/net/wireless/ti/wl1251/wl1251.h | 2 +- drivers/net/wireless/ti/wlcore/debug.h | 2 +- drivers/net/wireless/ti/wlcore/sdio.c | 4 +- drivers/nfc/mei_phy.c | 4 +- drivers/nfc/pn533/i2c.c | 2 +- drivers/nfc/pn533/pn533.c | 2 +- drivers/nfc/pn533/uart.c | 2 +- drivers/nfc/pn533/usb.c | 9 +- drivers/nfc/pn544/i2c.c | 2 +- drivers/nfc/pn544/pn544.c | 4 +- drivers/nfc/port100.c | 4 +- drivers/nfc/st21nfca/core.c | 2 +- drivers/nfc/st21nfca/i2c.c | 2 +- drivers/nfc/trf7970a.c | 8 +- drivers/pci/probe.c | 2 +- .../platform/surface/aggregator/ssh_packet_layer.c | 5 +- drivers/platform/x86/amd/pmf/tee-if.c | 2 +- drivers/ras/amd/fmpm.c | 2 +- drivers/rpmsg/rpmsg_ns.c | 2 +- drivers/rpmsg/virtio_rpmsg_bus.c | 4 +- drivers/s390/crypto/ap_queue.c | 4 +- drivers/s390/crypto/zcrypt_api.c | 8 +- drivers/s390/net/qeth_core_main.c | 8 +- drivers/scsi/esas2r/esas2r_log.c | 2 +- drivers/scsi/qedf/qedf_fip.c | 4 +- drivers/scsi/qedf/qedf_io.c | 2 +- drivers/scsi/qedf/qedf_main.c | 4 +- drivers/scsi/qla2xxx/qla_dbg.c | 2 +- drivers/soc/ti/k3-ringacc.c | 2 +- drivers/spi/spi-pl022.c | 18 +-- .../staging/gpib/agilent_82357a/agilent_82357a.c | 2 +- drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 2 +- drivers/staging/nvec/nvec.c | 4 +- drivers/staging/nvec/nvec_ps2.c | 2 +- .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 4 +- drivers/tty/n_gsm.c | 6 +- drivers/ufs/core/ufshcd.c | 2 +- drivers/usb/class/usbtmc.c | 12 +- drivers/usb/core/devio.c | 6 +- drivers/usb/gadget/function/f_ncm.c | 2 +- drivers/usb/gadget/udc/gr_udc.c | 2 +- drivers/usb/usbip/usbip_common.c | 2 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 2 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 2 +- drivers/watchdog/wdrtas.c | 2 +- fs/ceph/mdsmap.c | 2 +- fs/ecryptfs/debug.c | 2 +- fs/ext4/super.c | 3 +- fs/jfs/xattr.c | 2 +- fs/seq_file.c | 2 +- fs/smb/client/cifs_debug.c | 2 +- fs/smb/client/misc.c | 2 +- fs/ubifs/debug.c | 2 +- fs/ubifs/scan.c | 2 +- fs/xfs/xfs_message.c | 2 +- include/linux/dma/ti-cppi5.h | 2 +- include/linux/dynamic_debug.h | 8 +- include/linux/filter.h | 2 +- include/linux/mlx5/cq.h | 2 +- include/linux/printk.h | 22 ++-- include/net/6lowpan.h | 4 +- lib/hexdump.c | 10 +- lib/test_bitmap.c | 4 +- mm/debug.c | 4 +- mm/dmapool.c | 2 +- mm/kmemleak.c | 2 +- mm/page_poison.c | 2 +- mm/slub.c | 2 +- net/atm/br2684.c | 2 +- net/atm/lec.c | 4 +- net/ceph/crypto.c | 6 +- net/ceph/messenger.c | 22 ++-- net/ceph/osdmap.c | 4 +- net/core/skbuff.c | 8 +- net/ipv4/route.c | 2 +- net/nfc/digital_core.c | 4 +- net/nfc/llcp_core.c | 4 +- samples/rpmsg/rpmsg_client_sample.c | 3 +- security/integrity/ima/ima_kexec.c | 3 +- sound/soc/codecs/hdac_hdmi.c | 2 +- sound/soc/intel/atom/sst/sst_ipc.c | 2 +- sound/soc/intel/catpt/loader.c | 14 +-- sound/soc/sof/ipc3.c | 2 +- sound/soc/sof/ipc4.c | 2 +- sound/usb/bcd2000/bcd2000.c | 2 +- sound/usb/quirks.c | 4 +- sound/usb/validate.c | 4 +- tools/testing/crypto/chacha20-s390/test-cipher.c | 33 +++--- tools/testing/nvdimm/test/nfit.c | 2 +- 221 files changed, 658 insertions(+), 759 deletions(-) diff --git a/arch/um/include/shared/user.h b/arch/um/include/shared/user.h index 139eb78a476748953fe66fd7d9df7c94d8547c89..584012ee049dbc3d659c28d6d6c= 4ce38df3e15fd 100644 --- a/arch/um/include/shared/user.h +++ b/arch/um/include/shared/user.h @@ -44,7 +44,7 @@ extern int _printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); extern void print_hex_dump(const char *level, const char *prefix_str, int prefix_type, int rowsize, int groupsize, - const void *buf, size_t len, _Bool ascii); + const void *buf, size_t len, unsigned int flags); #else static inline int printk(const char *fmt, ...) { @@ -52,7 +52,7 @@ static inline int printk(const char *fmt, ...) } static inline void print_hex_dump(const char *level, const char *prefix_st= r, int prefix_type, int rowsize, int groupsize, - const void *buf, size_t len, _Bool ascii) + const void *buf, size_t len, unsigned int flags) { } #endif diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 4a1b1b28abf95cf63c04e1750fab035d097d96cd..5b074919bda2334db6a47cefacd= c896f8c2747c8 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c @@ -182,8 +182,8 @@ static void __init smp_dump_mptable(struct mpc_table *m= pc, unsigned char *mpt) { pr_err("Your mptable is wrong, contact your HW vendor!\n"); pr_cont("type %x\n", *mpt); - print_hex_dump(KERN_ERR, " ", DUMP_PREFIX_ADDRESS, 16, - 1, mpc, mpc->length, 1); + print_hex_dump(KERN_ERR, " ", DUMP_PREFIX_ADDRESS, 16, 1, + mpc, mpc->length, DUMP_FLAG_ASCII); } =20 static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 943bd074a5d37212a1fdf1f01e42f1c8f0e416c6..280c0615db2ed1d35fe35e28712= a4e27a52d37bb 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -889,7 +889,7 @@ static int sev_es_sync_vmsa(struct vcpu_svm *svm) } =20 pr_debug("Virtual Machine Save Area (VMSA):\n"); - print_hex_dump_debug("", DUMP_PREFIX_NONE, 16, 1, save, sizeof(*save), fa= lse); + print_hex_dump_debug("", DUMP_PREFIX_NONE, 16, 1, save, sizeof(*save), 0); =20 return 0; } diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c index 38092d21acf8e4b285e649cbea6b3bc6920bfa7c..b4a2632e2a8e6ce9d2bab21c4c7= fbfd285f69fa8 100644 --- a/arch/xtensa/kernel/traps.c +++ b/arch/xtensa/kernel/traps.c @@ -184,7 +184,7 @@ static inline void dump_user_code(struct pt_regs *regs) =20 if (copy_from_user(buf, (void __user *)(regs->pc & -16), sizeof(buf)) =3D= =3D 0) { print_hex_dump(KERN_INFO, " ", DUMP_PREFIX_NONE, - 32, 1, buf, sizeof(buf), false); + 32, 1, buf, sizeof(buf), 0); =20 } } @@ -596,7 +596,7 @@ static int show_stack_fragment_cb(struct stackframe *fr= ame, void *data) __memcpy(line, sf->sp + sf->off, line_len); print_hex_dump(sf->loglvl, arrow ? "> " : " ", DUMP_PREFIX_NONE, STACK_DUMP_LINE_SIZE, STACK_DUMP_ENTRY_SIZE, - line, line_len, false); + line, line_len, 0); sf->off +=3D STACK_DUMP_LINE_SIZE; if (arrow) return 0; diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c index 3f512efaba3aa11209cf6a9e9a6db1ae87d2501f..7a4098766ffd3d2126f93b7aeee= c2d10f81c6336 100644 --- a/crypto/ansi_cprng.c +++ b/crypto/ansi_cprng.c @@ -56,7 +56,7 @@ static void hexdump(char *note, unsigned char *buf, unsig= ned int len) printk(KERN_CRIT "%s", note); print_hex_dump(KERN_CONT, "", DUMP_PREFIX_OFFSET, 16, 1, - buf, len, false); + buf, len, 0); } } =20 diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 3fc908bac21aea487b5ef7cd996c1c61865cfaa5..662cde113cf8d92252428c80cd9= 9df942b5c376a 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -166,7 +166,7 @@ static void hexdump(unsigned char *buf, unsigned int le= n) { print_hex_dump(KERN_CONT, "", DUMP_PREFIX_OFFSET, 16, 1, - buf, len, false); + buf, len, 0); } =20 static int __testmgr_alloc_buf(char *buf[XBUFSIZE], int order) diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 5429ec9ef06f06535f32c82d38e968414bbc8e5b..cfcf2f17573026245944bc94813= bd1de1a6f6d6c 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -530,9 +530,8 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc= , struct nvdimm *nvdimm, dev_dbg(dev, "%s cmd: %d: family: %d func: %d input length: %d\n", dimm_name, cmd, family, func, in_buf.buffer.length); if (payload_dumpable(nvdimm, func)) - print_hex_dump_debug("nvdimm in ", DUMP_PREFIX_OFFSET, 4, 4, - in_buf.buffer.pointer, - min_t(u32, 256, in_buf.buffer.length), true); + print_hex_dump_debug("nvdimm in ", DUMP_PREFIX_OFFSET, 4, 4, in_buf.buf= fer.pointer, + min_t(u32, 256, in_buf.buffer.length), DUMP_FLAG_ASCII); =20 /* call the BIOS, prefer the named methods over _DSM if available */ if (nvdimm && cmd =3D=3D ND_CMD_GET_CONFIG_SIZE @@ -575,7 +574,8 @@ int acpi_nfit_ctl(struct nvdimm_bus_descriptor *nd_desc= , struct nvdimm *nvdimm, cmd_name, out_obj->buffer.length); print_hex_dump_debug(cmd_name, DUMP_PREFIX_OFFSET, 4, 4, out_obj->buffer.pointer, - min_t(u32, 128, out_obj->buffer.length), true); + min_t(u32, 128, out_obj->buffer.length), + DUMP_FLAG_ASCII); =20 if (call_pkg) { call_pkg->nd_fw_size =3D out_obj->buffer.length; diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index c085dd81ebe7f646c061cd813fdcb3f4428b16cb..03acc27dab88c2b40c746df612b= b894ca6a48b2b 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -1826,8 +1826,8 @@ int ata_dev_read_id(struct ata_device *dev, unsigned = int *p_class, ata_dev_info(dev, "dumping IDENTIFY data, " "class=3D%d may_fallback=3D%d tried_spinup=3D%d\n", class, may_fallback, tried_spinup); - print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, - 16, 2, id, ATA_ID_WORDS * sizeof(*id), true); + print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 2, id, + ATA_ID_WORDS * sizeof(*id), DUMP_FLAG_ASCII); } =20 /* Falling back doesn't make sense if ID data was read diff --git a/drivers/ata/pata_parport/bpck.c b/drivers/ata/pata_parport/bpc= k.c index bba1eda65f362662b86f1b0c5fee7094364dcb24..1f59fa739a20462d89814c38845= e7fafddc4f83c 100644 --- a/drivers/ata/pata_parport/bpck.c +++ b/drivers/ata/pata_parport/bpck.c @@ -368,7 +368,7 @@ static int bpck_test_proto(struct pi_adapter *pi) dev_dbg(&pi->dev, "bpck: 0x%x unit %d mode %d: ", pi->port, pi->unit, pi->mode); print_hex_dump_debug("bpck: ", DUMP_PREFIX_NONE, TEST_LEN, 1, buf, - TEST_LEN, false); + TEST_LEN, 0); =20 e =3D 0; for (i =3D 0; i < TEST_LEN; i++) { diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 3affb538b9890da73b2b99bc3bb9de0fc6e4c94e..d65ce8e27c02da425b73cbab7ba= 6254183dd35bc 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -1073,7 +1073,7 @@ static void setup_DMA(void) if (raw_cmd->length =3D=3D 0) { print_hex_dump(KERN_INFO, "zero dma transfer size: ", DUMP_PREFIX_NONE, 16, 1, - raw_cmd->fullcmd, raw_cmd->cmd_count, false); + raw_cmd->fullcmd, raw_cmd->cmd_count, 0); cont->done(0); fdc_state[current_fdc].reset =3D 1; return; @@ -1847,7 +1847,7 @@ static void show_floppy(int fdc) pr_info("last result at %lu\n", resultjiffies); pr_info("last redo_fd_request at %lu\n", lastredo); print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE, 16, 1, - reply_buffer, resultsize, true); + reply_buffer, resultsize, DUMP_FLAG_ASCII); =20 pr_info("status=3D%x\n", fdc_inb(fdc, FD_STATUS)); pr_info("fdc_busy=3D%lu\n", fdc_busy); diff --git a/drivers/cdx/controller/mcdi.c b/drivers/cdx/controller/mcdi.c index e760f8d347cc190e3a30c3802b170e3a309b82a1..25c0074bb42dd2a7cc6cb077e90= 36844ae6f01ff 100644 --- a/drivers/cdx/controller/mcdi.c +++ b/drivers/cdx/controller/mcdi.c @@ -257,8 +257,8 @@ static void cdx_mcdi_send_request(struct cdx_mcdi *cdx, hdr[0].cdx_u32 |=3D (__force __le32)(cdx_mcdi_payload_csum(hdr, hdr_len, = inbuf, inlen) << MCDI_HEADER_XFLAGS_LBN); =20 - print_hex_dump_debug("MCDI REQ HEADER: ", DUMP_PREFIX_NONE, 32, 4, hdr, h= dr_len, false); - print_hex_dump_debug("MCDI REQ PAYLOAD: ", DUMP_PREFIX_NONE, 32, 4, inbuf= , inlen, false); + print_hex_dump_debug("MCDI REQ HEADER: ", DUMP_PREFIX_NONE, 32, 4, hdr, h= dr_len, 0); + print_hex_dump_debug("MCDI REQ PAYLOAD: ", DUMP_PREFIX_NONE, 32, 4, inbuf= , inlen, 0); =20 cdx->mcdi_ops->mcdi_request(cdx, hdr, hdr_len, inbuf, inlen); =20 @@ -647,9 +647,9 @@ static bool cdx_mcdi_complete_cmd(struct cdx_mcdi_iface= *mcdi, } =20 print_hex_dump_debug("MCDI RESP HEADER: ", DUMP_PREFIX_NONE, 32, 4, - outbuf, resp_hdr_len, false); + outbuf, resp_hdr_len, 0); print_hex_dump_debug("MCDI RESP PAYLOAD: ", DUMP_PREFIX_NONE, 32, 4, - outbuf + (resp_hdr_len / 4), resp_data_len, false); + outbuf + (resp_hdr_len / 4), resp_data_len, 0); =20 if (error && resp_data_len =3D=3D 0) { /* MC rebooted during command */ diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c b/drivers/cr= ypto/allwinner/sun8i-ce/sun8i-ce-core.c index ec1ffda9ea32e0ea662850dd345b760938c065e7..66967f2aba8789c20149e948c72= 06e3992cc94eb 100644 --- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c @@ -228,7 +228,7 @@ int sun8i_ce_run_task(struct sun8i_ce_dev *ce, int flow= , const char *name) dev_err(ce->dev, "CE ERROR: %x for flow %x\n", v, flow); err =3D -EFAULT; print_hex_dump(KERN_INFO, "TASK: ", DUMP_PREFIX_NONE, 16, 4, - cet, sizeof(struct ce_task), false); + cet, sizeof(struct ce_task), 0); } if (v & CE_ERR_ALGO_NOTSUP) dev_err(ce->dev, "CE ERROR: algorithm not supported\n"); @@ -247,7 +247,7 @@ int sun8i_ce_run_task(struct sun8i_ce_dev *ce, int flow= , const char *name) dev_err(ce->dev, "CE ERROR: %x for flow %x\n", v, flow); err =3D -EFAULT; print_hex_dump(KERN_INFO, "TASK: ", DUMP_PREFIX_NONE, 16, 4, - cet, sizeof(struct ce_task), false); + cet, sizeof(struct ce_task), 0); } if (v & CE_ERR_ALGO_NOTSUP) dev_err(ce->dev, "CE ERROR: algorithm not supported\n"); @@ -263,7 +263,7 @@ int sun8i_ce_run_task(struct sun8i_ce_dev *ce, int flow= , const char *name) dev_err(ce->dev, "CE ERROR: %x for flow %x\n", v, flow); err =3D -EFAULT; print_hex_dump(KERN_INFO, "TASK: ", DUMP_PREFIX_NONE, 16, 4, - cet, sizeof(struct ce_task), false); + cet, sizeof(struct ce_task), 0); } if (v & CE_ERR_ALGO_NOTSUP) dev_err(ce->dev, "CE ERROR: algorithm not supported\n"); diff --git a/drivers/crypto/axis/artpec6_crypto.c b/drivers/crypto/axis/art= pec6_crypto.c index 1c1f57baef0ea9f4ecf7ab39f2c0e9e4327ef568..519d5bd0c23f577e01f1a6cf456= c34cc647eeddc 100644 --- a/drivers/crypto/axis/artpec6_crypto.c +++ b/drivers/crypto/axis/artpec6_crypto.c @@ -2206,10 +2206,10 @@ static void artpec6_crypto_complete_aead(struct cry= pto_async_request *req) authsize)) { pr_debug("***EBADMSG:\n"); print_hex_dump_debug("ref:", DUMP_PREFIX_ADDRESS, 32, 1, - input_tag, authsize, true); + input_tag, authsize, DUMP_FLAG_ASCII); print_hex_dump_debug("out:", DUMP_PREFIX_ADDRESS, 32, 1, req_ctx->decryption_tag, - authsize, true); + authsize, DUMP_FLAG_ASCII); =20 result =3D -EBADMSG; } diff --git a/drivers/crypto/bcm/util.c b/drivers/crypto/bcm/util.c index d5d9cabea55aa4d4d621731a6200977e76928ac7..54cd8ca7112a79eb0a0afca6dc1= d39a2291f3b25 100644 --- a/drivers/crypto/bcm/util.c +++ b/drivers/crypto/bcm/util.c @@ -283,7 +283,7 @@ void __dump_sg(struct scatterlist *sg, unsigned int ski= p, unsigned int len) sg_copy_part_to_buf(sg, dbuf, count, idx); num_out +=3D count; print_hex_dump(KERN_ALERT, " sg: ", DUMP_PREFIX_NONE, - 4, 1, dbuf, count, false); + 4, 1, dbuf, count, 0); idx +=3D 16; } } diff --git a/drivers/crypto/bcm/util.h b/drivers/crypto/bcm/util.h index 61c256384816f56c47bf26d762ac458bd272413a..06b96e792b01e643667dbaf7395= 01693c606a6d7 100644 --- a/drivers/crypto/bcm/util.h +++ b/drivers/crypto/bcm/util.h @@ -28,7 +28,7 @@ extern int debug_logging_sleep; do { \ if (flow_debug_logging) { \ print_hex_dump(KERN_ALERT, msg, DUMP_PREFIX_NONE, \ - 16, 1, var, var_len, false); \ + 16, 1, var, var_len, 0); \ if (debug_logging_sleep) \ msleep(debug_logging_sleep); \ } \ @@ -46,7 +46,7 @@ extern int debug_logging_sleep; do { \ if (packet_debug_logging) { \ print_hex_dump(KERN_ALERT, msg, DUMP_PREFIX_NONE, \ - 16, 1, var, var_len, false); \ + 16, 1, var, var_len, 0); \ if (debug_logging_sleep) \ msleep(debug_logging_sleep); \ } \ diff --git a/drivers/crypto/caam/blob_gen.c b/drivers/crypto/caam/blob_gen.c index 87781c1534ee5b0758539298b34cebe7d6cb81bb..e0c06f3f244ad2268dfac689351= 76cdf7a494229 100644 --- a/drivers/crypto/caam/blob_gen.c +++ b/drivers/crypto/caam/blob_gen.c @@ -126,10 +126,10 @@ int caam_process_blob(struct caam_blob_priv *priv, =20 print_hex_dump_debug("data@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 1, info->input, - info->input_len, false); + info->input_len, 0); print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 1, desc, - desc_bytes(desc), false); + desc_bytes(desc), 0); =20 testres.err =3D 0; init_completion(&testres.completion); @@ -140,7 +140,7 @@ int caam_process_blob(struct caam_blob_priv *priv, ret =3D testres.err; print_hex_dump_debug("output@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 1, info->output, - output_len, false); + output_len, 0); } =20 if (ret =3D=3D 0) diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 2cfb1b8d8c7cfc585f405c6f3a5c13be0aee08d0..38bd27ce0f6e5a12e0edc9eff2d= 62f00ba4fd992 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -597,8 +597,8 @@ static int aead_setkey(struct crypto_aead *aead, dev_dbg(jrdev, "keylen %d enckeylen %d authkeylen %d\n", keys.authkeylen + keys.enckeylen, keys.enckeylen, keys.authkeylen); - print_hex_dump_debug("key in @"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + print_hex_dump_debug("key in @"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + key, keylen, DUMP_FLAG_ASCII); =20 /* * If DKP is supported, use it in the shared descriptor to generate @@ -633,9 +633,8 @@ static int aead_setkey(struct crypto_aead *aead, dma_sync_single_for_device(jrdev, ctx->key_dma, ctx->adata.keylen_pad + keys.enckeylen, ctx->dir); =20 - print_hex_dump_debug("ctx.key@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, ctx->key, - ctx->adata.keylen_pad + keys.enckeylen, 1); + print_hex_dump_debug("ctx.key@"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + ctx->key, ctx->adata.keylen_pad + keys.enckeylen, DUMP_FLAG_ASCII); =20 skip_split_key: ctx->cdata.keylen =3D keys.enckeylen; @@ -674,8 +673,8 @@ static int gcm_setkey(struct crypto_aead *aead, if (err) return err; =20 - print_hex_dump_debug("key in @"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + print_hex_dump_debug("key in @"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + key, keylen, DUMP_FLAG_ASCII); =20 memcpy(ctx->key, key, keylen); dma_sync_single_for_device(jrdev, ctx->key_dma, keylen, ctx->dir); @@ -695,8 +694,8 @@ static int rfc4106_setkey(struct crypto_aead *aead, if (err) return err; =20 - print_hex_dump_debug("key in @"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + print_hex_dump_debug("key in @"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + key, keylen, DUMP_FLAG_ASCII); =20 memcpy(ctx->key, key, keylen); =20 @@ -721,8 +720,8 @@ static int rfc4543_setkey(struct crypto_aead *aead, if (err) return err; =20 - print_hex_dump_debug("key in @"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + print_hex_dump_debug("key in @"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + key, keylen, DUMP_FLAG_ASCII); =20 memcpy(ctx->key, key, keylen); =20 @@ -748,8 +747,8 @@ static int skcipher_setkey(struct crypto_skcipher *skci= pher, const u8 *key, u32 *desc; const bool is_rfc3686 =3D alg->caam.rfc3686; =20 - print_hex_dump_debug("key in @"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + print_hex_dump_debug("key in @"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + key, keylen, DUMP_FLAG_ASCII); =20 ctx->cdata.keylen =3D keylen; ctx->cdata.key_virt =3D key; @@ -1044,9 +1043,8 @@ static void skcipher_crypt_done(struct device *jrdev,= u32 *desc, u32 err, if (ivsize && !ecode) { memcpy(req->iv, skcipher_edesc_iv(edesc), ivsize); =20 - print_hex_dump_debug("dstiv @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, req->iv, - ivsize, 1); + print_hex_dump_debug("dstiv @" __stringify(__LINE__)": ", DUMP_PREFIX_A= DDRESS, + 16, 4, req->iv, ivsize, DUMP_FLAG_ASCII); } =20 caam_dump_sg("dst @" __stringify(__LINE__)": ", @@ -1260,8 +1258,8 @@ static void init_skcipher_job(struct skcipher_request= *req, dma_addr_t src_dma, dst_dma, ptr; int len, sec4_sg_index =3D 0; =20 - print_hex_dump_debug("presciv@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, req->iv, ivsize, 1); + print_hex_dump_debug("presciv@"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + req->iv, ivsize, DUMP_FLAG_ASCII); dev_dbg(jrdev, "asked=3D%d, cryptlen%d\n", (int)edesc->src_nents > 1 ? 100 : req->cryptlen, req->cryptlen); =20 @@ -1486,9 +1484,8 @@ static inline int chachapoly_crypt(struct aead_reques= t *req, bool encrypt) desc =3D edesc->hw_desc; =20 init_chachapoly_job(req, edesc, all_contig, encrypt); - print_hex_dump_debug("chachapoly jobdesc@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + print_hex_dump_debug("chachapoly jobdesc@" __stringify(__LINE__)": ", DUM= P_PREFIX_ADDRESS, + 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 return aead_enqueue_req(jrdev, req); } @@ -1520,9 +1517,8 @@ static inline int aead_crypt(struct aead_request *req= , bool encrypt) /* Create and submit job descriptor */ init_authenc_job(req, edesc, all_contig, encrypt); =20 - print_hex_dump_debug("aead jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc, - desc_bytes(edesc->hw_desc), 1); + print_hex_dump_debug("aead jobdesc@"__stringify(__LINE__)": ", DUMP_PREFI= X_ADDRESS, 16, 4, + edesc->hw_desc, desc_bytes(edesc->hw_desc), DUMP_FLAG_ASCII); =20 return aead_enqueue_req(jrdev, req); } @@ -1579,9 +1575,8 @@ static inline int gcm_crypt(struct aead_request *req,= bool encrypt) /* Create and submit job descriptor */ init_gcm_job(req, edesc, all_contig, encrypt); =20 - print_hex_dump_debug("aead jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc, - desc_bytes(edesc->hw_desc), 1); + print_hex_dump_debug("aead jobdesc@"__stringify(__LINE__)": ", DUMP_PREFI= X_ADDRESS, 16, 4, + edesc->hw_desc, desc_bytes(edesc->hw_desc), DUMP_FLAG_ASCII); =20 return aead_enqueue_req(jrdev, req); } @@ -1767,9 +1762,8 @@ static struct skcipher_edesc *skcipher_edesc_alloc(st= ruct skcipher_request *req, =20 edesc->iv_dma =3D iv_dma; =20 - print_hex_dump_debug("skcipher sec4_sg@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, edesc->sec4_sg, - sec4_sg_bytes, 1); + print_hex_dump_debug("skcipher sec4_sg@" __stringify(__LINE__)": ", DUMP_= PREFIX_ADDRESS, + 16, 4, edesc->sec4_sg, sec4_sg_bytes, DUMP_FLAG_ASCII); =20 return edesc; } @@ -1850,9 +1844,8 @@ static inline int skcipher_crypt(struct skcipher_requ= est *req, bool encrypt) /* Create and submit job descriptor*/ init_skcipher_job(req, edesc, encrypt); =20 - print_hex_dump_debug("skcipher jobdesc@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, edesc->hw_desc, - desc_bytes(edesc->hw_desc), 1); + print_hex_dump_debug("skcipher jobdesc@" __stringify(__LINE__)": ", DUMP_= PREFIX_ADDRESS, + 16, 4, edesc->hw_desc, esc_bytes(edesc->hw_desc), DUMP_FLAG_ASCII); =20 desc =3D edesc->hw_desc; /* diff --git a/drivers/crypto/caam/caamalg_desc.c b/drivers/crypto/caam/caama= lg_desc.c index 7571e1ac913b1d35fb49e35f95cc1d1b7b79864f..d0a3f3843375933be60a48fadbb= 4ec08329c98b8 100644 --- a/drivers/crypto/caam/caamalg_desc.c +++ b/drivers/crypto/caam/caamalg_desc.c @@ -116,7 +116,7 @@ void cnstr_shdsc_aead_null_encap(u32 * const desc, stru= ct alginfo *adata, =20 print_hex_dump_debug("aead null enc shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_aead_null_encap); =20 @@ -203,7 +203,7 @@ void cnstr_shdsc_aead_null_decap(u32 * const desc, stru= ct alginfo *adata, =20 print_hex_dump_debug("aead null dec shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_aead_null_decap); =20 @@ -355,7 +355,7 @@ void cnstr_shdsc_aead_encap(u32 * const desc, struct al= ginfo *cdata, =20 print_hex_dump_debug("aead enc shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_aead_encap); =20 @@ -472,7 +472,7 @@ void cnstr_shdsc_aead_decap(u32 * const desc, struct al= ginfo *cdata, =20 print_hex_dump_debug("aead dec shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_aead_decap); =20 @@ -618,7 +618,7 @@ void cnstr_shdsc_aead_givencap(u32 * const desc, struct= alginfo *cdata, =20 print_hex_dump_debug("aead givenc shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_aead_givencap); =20 @@ -745,7 +745,7 @@ void cnstr_shdsc_gcm_encap(u32 * const desc, struct alg= info *cdata, =20 print_hex_dump_debug("gcm enc shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_gcm_encap); =20 @@ -840,7 +840,7 @@ void cnstr_shdsc_gcm_decap(u32 * const desc, struct alg= info *cdata, =20 print_hex_dump_debug("gcm dec shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_gcm_decap); =20 @@ -951,7 +951,7 @@ void cnstr_shdsc_rfc4106_encap(u32 * const desc, struct= alginfo *cdata, =20 print_hex_dump_debug("rfc4106 enc shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_rfc4106_encap); =20 @@ -1046,7 +1046,7 @@ void cnstr_shdsc_rfc4106_decap(u32 * const desc, stru= ct alginfo *cdata, =20 print_hex_dump_debug("rfc4106 dec shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_rfc4106_decap); =20 @@ -1129,7 +1129,7 @@ void cnstr_shdsc_rfc4543_encap(u32 * const desc, stru= ct alginfo *cdata, =20 print_hex_dump_debug("rfc4543 enc shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_rfc4543_encap); =20 @@ -1217,7 +1217,7 @@ void cnstr_shdsc_rfc4543_decap(u32 * const desc, stru= ct alginfo *cdata, =20 print_hex_dump_debug("rfc4543 dec shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_rfc4543_decap); =20 @@ -1350,7 +1350,7 @@ void cnstr_shdsc_chachapoly(u32 * const desc, struct = alginfo *cdata, =20 print_hex_dump_debug("chachapoly shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_chachapoly); =20 @@ -1436,7 +1436,7 @@ void cnstr_shdsc_skcipher_encap(u32 * const desc, str= uct alginfo *cdata, =20 print_hex_dump_debug("skcipher enc shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_skcipher_encap); =20 @@ -1513,7 +1513,7 @@ void cnstr_shdsc_skcipher_decap(u32 * const desc, str= uct alginfo *cdata, =20 print_hex_dump_debug("skcipher dec shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_skcipher_decap); =20 @@ -1575,7 +1575,7 @@ void cnstr_shdsc_xts_skcipher_encap(u32 * const desc,= struct alginfo *cdata) =20 print_hex_dump_debug("xts skcipher enc shdesc@" __stringify(__LINE__) ": ", DUMP_PREFIX_ADDRESS, 16, 4, - desc, desc_bytes(desc), 1); + desc, desc_bytes(desc), DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_xts_skcipher_encap); =20 @@ -1635,7 +1635,7 @@ void cnstr_shdsc_xts_skcipher_decap(u32 * const desc,= struct alginfo *cdata) =20 print_hex_dump_debug("xts skcipher dec shdesc@" __stringify(__LINE__) ": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + desc_bytes(desc), DUMP_FLAG_ASCII); } EXPORT_SYMBOL(cnstr_shdsc_xts_skcipher_decap); =20 diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg= _qi.c index 65f6adb6c673f8016533b018035b9715b6be3c64..bfff6d42c0bce2d61747f704a0b= 694f0a5eafb46 100644 --- a/drivers/crypto/caam/caamalg_qi.c +++ b/drivers/crypto/caam/caamalg_qi.c @@ -212,8 +212,8 @@ static int aead_setkey(struct crypto_aead *aead, const = u8 *key, dev_dbg(jrdev, "keylen %d enckeylen %d authkeylen %d\n", keys.authkeylen + keys.enckeylen, keys.enckeylen, keys.authkeylen); - print_hex_dump_debug("key in @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + print_hex_dump_debug("key in @" __stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, 16, 4, + key, keylen, DUMP_FLAG_ASCII); =20 /* * If DKP is supported, use it in the shared descriptor to generate @@ -248,9 +248,8 @@ static int aead_setkey(struct crypto_aead *aead, const = u8 *key, ctx->adata.keylen_pad + keys.enckeylen, ctx->dir); =20 - print_hex_dump_debug("ctx.key@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, ctx->key, - ctx->adata.keylen_pad + keys.enckeylen, 1); + print_hex_dump_debug("ctx.key@" __stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, 16, 4, + ctx->key, ctx->adata.keylen_pad + keys.enckeylen, DUMP_FLAG_ASCII); =20 skip_split_key: ctx->cdata.keylen =3D keys.enckeylen; @@ -371,8 +370,8 @@ static int gcm_setkey(struct crypto_aead *aead, if (ret) return ret; =20 - print_hex_dump_debug("key in @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + print_hex_dump_debug("key in @" __stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, 16, 4, + key, keylen, DUMP_FLAG_ASCII); =20 memcpy(ctx->key, key, keylen); dma_sync_single_for_device(jrdev->parent, ctx->key_dma, keylen, @@ -475,8 +474,8 @@ static int rfc4106_setkey(struct crypto_aead *aead, if (ret) return ret; =20 - print_hex_dump_debug("key in @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + print_hex_dump_debug("key in @" __stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, 16, 4, + key, keylen, DUMP_FLAG_ASCII); =20 memcpy(ctx->key, key, keylen); /* @@ -581,8 +580,8 @@ static int rfc4543_setkey(struct crypto_aead *aead, if (ret) return ret; =20 - print_hex_dump_debug("key in @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + print_hex_dump_debug("key in @" __stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, 16, 4, + key, keylen, DUMP_FLAG_ASCII); =20 memcpy(ctx->key, key, keylen); /* @@ -631,8 +630,8 @@ static int skcipher_setkey(struct crypto_skcipher *skci= pher, const u8 *key, const bool is_rfc3686 =3D alg->caam.rfc3686; int ret =3D 0; =20 - print_hex_dump_debug("key in @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + print_hex_dump_debug("key in @" __stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, 16, 4, + key, keylen, DUMP_FLAG_ASCII); =20 ctx->cdata.keylen =3D keylen; ctx->cdata.key_virt =3D key; @@ -1230,9 +1229,8 @@ static void skcipher_done(struct caam_drv_req *drv_re= q, u32 status) if (status) ecode =3D caam_jr_strstatus(qidev, status); =20 - print_hex_dump_debug("dstiv @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, req->iv, - edesc->src_nents > 1 ? 100 : ivsize, 1); + print_hex_dump_debug("dstiv @" __stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, 16, 4, + req->iv, edesc->src_nents > 1 ? 100 : ivsize, DUMP_FLAG_ASCII); caam_dump_sg("dst @" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, req->dst, edesc->dst_nents > 1 ? 100 : req->cryptlen, 1); diff --git a/drivers/crypto/caam/caamalg_qi2.c b/drivers/crypto/caam/caamal= g_qi2.c index e809d030ab1135ad43887a99c0e115f58ae9f7b1..2a1beff8775decdbc72beda244c= d9a69ef3d7849 100644 --- a/drivers/crypto/caam/caamalg_qi2.c +++ b/drivers/crypto/caam/caamalg_qi2.c @@ -300,7 +300,7 @@ static int aead_setkey(struct crypto_aead *aead, const = u8 *key, keys.authkeylen + keys.enckeylen, keys.enckeylen, keys.authkeylen); print_hex_dump_debug("key in @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, DUMP_FLAG_ASCII); =20 ctx->adata.keylen =3D keys.authkeylen; ctx->adata.keylen_pad =3D split_key_len(ctx->adata.algtype & @@ -313,9 +313,8 @@ static int aead_setkey(struct crypto_aead *aead, const = u8 *key, memcpy(ctx->key + ctx->adata.keylen_pad, keys.enckey, keys.enckeylen); dma_sync_single_for_device(dev, ctx->key_dma, ctx->adata.keylen_pad + keys.enckeylen, ctx->dir); - print_hex_dump_debug("ctx.key@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, ctx->key, - ctx->adata.keylen_pad + keys.enckeylen, 1); + print_hex_dump_debug("ctx.key@" __stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, 16, 4, + ctx->key, ctx->adata.keylen_pad + keys.enckeylen, DUMP_FLAG_ASCII); =20 ctx->cdata.keylen =3D keys.enckeylen; =20 @@ -731,7 +730,7 @@ static int gcm_setkey(struct crypto_aead *aead, if (ret) return ret; print_hex_dump_debug("key in @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, DUMP_FLAG_ASCII); =20 memcpy(ctx->key, key, keylen); dma_sync_single_for_device(dev, ctx->key_dma, keylen, ctx->dir); @@ -827,7 +826,7 @@ static int rfc4106_setkey(struct crypto_aead *aead, return ret; =20 print_hex_dump_debug("key in @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, DUMP_FLAG_ASCII); =20 memcpy(ctx->key, key, keylen); /* @@ -926,7 +925,7 @@ static int rfc4543_setkey(struct crypto_aead *aead, return ret; =20 print_hex_dump_debug("key in @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, DUMP_FLAG_ASCII); =20 memcpy(ctx->key, key, keylen); /* @@ -954,7 +953,7 @@ static int skcipher_setkey(struct crypto_skcipher *skci= pher, const u8 *key, const bool is_rfc3686 =3D alg->caam.rfc3686; =20 print_hex_dump_debug("key in @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, DUMP_FLAG_ASCII); =20 ctx->cdata.keylen =3D keylen; ctx->cdata.key_virt =3D key; @@ -1405,9 +1404,8 @@ static void skcipher_encrypt_done(void *cbk_ctx, u32 = status) if (unlikely(status)) ecode =3D caam_qi2_strstatus(ctx->dev, status); =20 - print_hex_dump_debug("dstiv @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, req->iv, - edesc->src_nents > 1 ? 100 : ivsize, 1); + print_hex_dump_debug("dstiv @" __stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, 16, 4, + req->iv, edesc->src_nents > 1 ? 100 : ivsize, DUMP_FLAG_ASCII); caam_dump_sg("dst @" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, req->dst, edesc->dst_nents > 1 ? 100 : req->cryptlen, 1); @@ -1443,9 +1441,8 @@ static void skcipher_decrypt_done(void *cbk_ctx, u32 = status) if (unlikely(status)) ecode =3D caam_qi2_strstatus(ctx->dev, status); =20 - print_hex_dump_debug("dstiv @" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, req->iv, - edesc->src_nents > 1 ? 100 : ivsize, 1); + print_hex_dump_debug("dstiv @" __stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, 16, 4, + req->iv, edesc->src_nents > 1 ? 100 : ivsize, DUMP_FLAG_ASCII); caam_dump_sg("dst @" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, req->dst, edesc->dst_nents > 1 ? 100 : req->cryptlen, 1); @@ -3151,9 +3148,8 @@ static int ahash_set_sh_desc(struct crypto_ahash *aha= sh) flc->flc[1] =3D cpu_to_caam32(desc_len(desc)); /* SDL */ dma_sync_single_for_device(ctx->dev, ctx->flc_dma[UPDATE], desc_bytes(desc), DMA_BIDIRECTIONAL); - print_hex_dump_debug("ahash update shdesc@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + print_hex_dump_debug("ahash update shdesc@" __stringify(__LINE__)": ", DU= MP_PREFIX_ADDRESS, + 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 /* ahash_update_first shared descriptor */ flc =3D &ctx->flc[UPDATE_FIRST]; @@ -3164,8 +3160,7 @@ static int ahash_set_sh_desc(struct crypto_ahash *aha= sh) dma_sync_single_for_device(ctx->dev, ctx->flc_dma[UPDATE_FIRST], desc_bytes(desc), DMA_BIDIRECTIONAL); print_hex_dump_debug("ahash update first shdesc@" __stringify(__LINE__)":= ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 /* ahash_final shared descriptor */ flc =3D &ctx->flc[FINALIZE]; @@ -3176,8 +3171,7 @@ static int ahash_set_sh_desc(struct crypto_ahash *aha= sh) dma_sync_single_for_device(ctx->dev, ctx->flc_dma[FINALIZE], desc_bytes(desc), DMA_BIDIRECTIONAL); print_hex_dump_debug("ahash final shdesc@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 /* ahash_digest shared descriptor */ flc =3D &ctx->flc[DIGEST]; @@ -3188,8 +3182,7 @@ static int ahash_set_sh_desc(struct crypto_ahash *aha= sh) dma_sync_single_for_device(ctx->dev, ctx->flc_dma[DIGEST], desc_bytes(desc), DMA_BIDIRECTIONAL); print_hex_dump_debug("ahash digest shdesc@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 return 0; } @@ -3268,11 +3261,10 @@ static int hash_digest_key(struct caam_hash_ctx *ct= x, u32 *keylen, u8 *key, dpaa2_fl_set_addr(out_fle, key_dma); dpaa2_fl_set_len(out_fle, digestsize); =20 - print_hex_dump_debug("key_in@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, *keylen, 1); - print_hex_dump_debug("shdesc@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + print_hex_dump_debug("key_in@" __stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + key, *keylen, DUMP_FLAG_ASCII); + print_hex_dump_debug("shdesc@" __stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 result.err =3D 0; init_completion(&result.completion); @@ -3288,9 +3280,8 @@ static int hash_digest_key(struct caam_hash_ctx *ctx,= u32 *keylen, u8 *key, /* in progress */ wait_for_completion(&result.completion); ret =3D result.err; - print_hex_dump_debug("digested key@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, - digestsize, 1); + print_hex_dump_debug("digested key@" __stringify(__LINE__)": ", DUMP_PRE= FIX_ADDRESS, + 16, 4, key, digestsize, DUMP_FLAG_ASCII); } =20 dma_unmap_single(ctx->dev, flc_dma, sizeof(flc->flc) + desc_bytes(desc), @@ -3416,9 +3407,8 @@ static void ahash_done(void *cbk_ctx, u32 status) memcpy(req->result, state->caam_ctx, digestsize); qi_cache_free(edesc); =20 - print_hex_dump_debug("ctx@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, state->caam_ctx, - ctx->ctx_len, 1); + print_hex_dump_debug("ctx@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRES= S, 16, 4, + state->caam_ctx, ctx->ctx_len, DUMP_FLAG_ASCII); =20 ahash_request_complete(req, ecode); } @@ -3446,17 +3436,16 @@ static void ahash_done_bi(void *cbk_ctx, u32 status) state->next_buflen, 0); state->buflen =3D state->next_buflen; =20 - print_hex_dump_debug("buf@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, state->buf, - state->buflen, 1); + print_hex_dump_debug("buf@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRES= S, 16, 4, + state->buf, state->buflen, DUMP_FLAG_ASCII); =20 - print_hex_dump_debug("ctx@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, state->caam_ctx, - ctx->ctx_len, 1); + print_hex_dump_debug("ctx@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRES= S, 16, 4, + state->caam_ctx, ctx->ctx_len, DUMP_FLAG_ASCII); if (req->result) print_hex_dump_debug("result@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, req->result, - crypto_ahash_digestsize(ahash), 1); + crypto_ahash_digestsize(ahash), + DUMP_FLAG_ASCII); =20 ahash_request_complete(req, ecode); } @@ -3481,9 +3470,8 @@ static void ahash_done_ctx_src(void *cbk_ctx, u32 sta= tus) memcpy(req->result, state->caam_ctx, digestsize); qi_cache_free(edesc); =20 - print_hex_dump_debug("ctx@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, state->caam_ctx, - ctx->ctx_len, 1); + print_hex_dump_debug("ctx@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRES= S, 16, 4, + state->caam_ctx, ctx->ctx_len, DUMP_FLAG_ASCII); =20 ahash_request_complete(req, ecode); } @@ -3511,17 +3499,16 @@ static void ahash_done_ctx_dst(void *cbk_ctx, u32 s= tatus) state->next_buflen, 0); state->buflen =3D state->next_buflen; =20 - print_hex_dump_debug("buf@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, state->buf, - state->buflen, 1); + print_hex_dump_debug("buf@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRES= S, 16, 4, + state->buf, state->buflen, DUMP_FLAG_ASCII); =20 - print_hex_dump_debug("ctx@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, state->caam_ctx, - ctx->ctx_len, 1); + print_hex_dump_debug("ctx@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRES= S, 16, 4, + state->caam_ctx, ctx->ctx_len, DUMP_FLAG_ASCII); if (req->result) print_hex_dump_debug("result@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS, 16, 4, req->result, - crypto_ahash_digestsize(ahash), 1); + crypto_ahash_digestsize(ahash), + DUMP_FLAG_ASCII); =20 ahash_request_complete(req, ecode); } @@ -3633,9 +3620,8 @@ static int ahash_update_ctx(struct ahash_request *req) req->nbytes, 0); *buflen =3D *next_buflen; =20 - print_hex_dump_debug("buf@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, buf, - *buflen, 1); + print_hex_dump_debug("buf@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRE= SS, 16, 4, + buf, *buflen, DUMP_FLAG_ASCII); } =20 return ret; @@ -4087,9 +4073,8 @@ static int ahash_update_no_ctx(struct ahash_request *= req) req->nbytes, 0); *buflen =3D *next_buflen; =20 - print_hex_dump_debug("buf@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, buf, - *buflen, 1); + print_hex_dump_debug("buf@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRE= SS, 16, 4, + buf, *buflen, DUMP_FLAG_ASCII); } =20 return ret; @@ -4312,9 +4297,8 @@ static int ahash_update_first(struct ahash_request *r= eq) req->nbytes, 0); *buflen =3D *next_buflen; =20 - print_hex_dump_debug("buf@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, buf, - *buflen, 1); + print_hex_dump_debug("buf@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRE= SS, 16, 4, + buf, *buflen, DUMP_FLAG_ASCII); } =20 return ret; diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 25c02e2672585830a339aee391b1cf59d76d1db6..36c964f33103a057049da08dc60= 9683464934ab5 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -220,8 +220,7 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash) desc_bytes(desc), ctx->dir); =20 print_hex_dump_debug("ahash update shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 /* ahash_update_first shared descriptor */ desc =3D ctx->sh_desc_update_first; @@ -229,9 +228,8 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash) ctx->ctx_len, false, ctrlpriv->era); dma_sync_single_for_device(jrdev, ctx->sh_desc_update_first_dma, desc_bytes(desc), ctx->dir); - print_hex_dump_debug("ahash update first shdesc@"__stringify(__LINE__) - ": ", DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + print_hex_dump_debug("ahash update first shdesc@"__stringify(__LINE__)": = ", + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 /* ahash_final shared descriptor */ desc =3D ctx->sh_desc_fin; @@ -241,8 +239,7 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash) desc_bytes(desc), ctx->dir); =20 print_hex_dump_debug("ahash final shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 /* ahash_digest shared descriptor */ desc =3D ctx->sh_desc_digest; @@ -252,8 +249,7 @@ static int ahash_set_sh_desc(struct crypto_ahash *ahash) desc_bytes(desc), ctx->dir); =20 print_hex_dump_debug("ahash digest shdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 return 0; } @@ -272,8 +268,7 @@ static int axcbc_set_sh_desc(struct crypto_ahash *ahash) dma_sync_single_for_device(jrdev, ctx->sh_desc_update_dma, desc_bytes(desc), ctx->dir); print_hex_dump_debug("axcbc update shdesc@" __stringify(__LINE__)" : ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 /* shared descriptor for ahash_{final,finup} */ desc =3D ctx->sh_desc_fin; @@ -282,8 +277,7 @@ static int axcbc_set_sh_desc(struct crypto_ahash *ahash) dma_sync_single_for_device(jrdev, ctx->sh_desc_fin_dma, desc_bytes(desc), ctx->dir); print_hex_dump_debug("axcbc finup shdesc@" __stringify(__LINE__)" : ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 /* key is immediate data for INIT and INITFINAL states */ ctx->adata.key_virt =3D ctx->key; @@ -294,9 +288,8 @@ static int axcbc_set_sh_desc(struct crypto_ahash *ahash) ctx->ctx_len); dma_sync_single_for_device(jrdev, ctx->sh_desc_update_first_dma, desc_bytes(desc), ctx->dir); - print_hex_dump_debug("axcbc update first shdesc@" __stringify(__LINE__) - " : ", DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + print_hex_dump_debug("axcbc update first shdesc@" __stringify(__LINE__)" = : ", + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 /* shared descriptor for ahash_digest */ desc =3D ctx->sh_desc_digest; @@ -305,8 +298,7 @@ static int axcbc_set_sh_desc(struct crypto_ahash *ahash) dma_sync_single_for_device(jrdev, ctx->sh_desc_digest_dma, desc_bytes(desc), ctx->dir); print_hex_dump_debug("axcbc digest shdesc@" __stringify(__LINE__)" : ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); return 0; } =20 @@ -324,8 +316,7 @@ static int acmac_set_sh_desc(struct crypto_ahash *ahash) dma_sync_single_for_device(jrdev, ctx->sh_desc_update_dma, desc_bytes(desc), ctx->dir); print_hex_dump_debug("acmac update shdesc@" __stringify(__LINE__)" : ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 /* shared descriptor for ahash_{final,finup} */ desc =3D ctx->sh_desc_fin; @@ -334,8 +325,7 @@ static int acmac_set_sh_desc(struct crypto_ahash *ahash) dma_sync_single_for_device(jrdev, ctx->sh_desc_fin_dma, desc_bytes(desc), ctx->dir); print_hex_dump_debug("acmac finup shdesc@" __stringify(__LINE__)" : ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 /* shared descriptor for first invocation of ahash_update */ desc =3D ctx->sh_desc_update_first; @@ -343,9 +333,8 @@ static int acmac_set_sh_desc(struct crypto_ahash *ahash) ctx->ctx_len); dma_sync_single_for_device(jrdev, ctx->sh_desc_update_first_dma, desc_bytes(desc), ctx->dir); - print_hex_dump_debug("acmac update first shdesc@" __stringify(__LINE__) - " : ", DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + print_hex_dump_debug("acmac update first shdesc@" __stringify(__LINE__)" = : ", + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 /* shared descriptor for ahash_digest */ desc =3D ctx->sh_desc_digest; @@ -354,8 +343,7 @@ static int acmac_set_sh_desc(struct crypto_ahash *ahash) dma_sync_single_for_device(jrdev, ctx->sh_desc_digest_dma, desc_bytes(desc), ctx->dir); print_hex_dump_debug("acmac digest shdesc@" __stringify(__LINE__)" : ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 return 0; } @@ -394,10 +382,9 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, = u32 *keylen, u8 *key, LDST_SRCDST_BYTE_CONTEXT); =20 print_hex_dump_debug("key_in@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, *keylen, 1); + DUMP_PREFIX_ADDRESS, 16, 4, key, *keylen, DUMP_FLAG_ASCII); print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCI= I); =20 result.err =3D 0; init_completion(&result.completion); @@ -409,8 +396,7 @@ static int hash_digest_key(struct caam_hash_ctx *ctx, u= 32 *keylen, u8 *key, ret =3D result.err; =20 print_hex_dump_debug("digested key@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key, - digestsize, 1); + DUMP_PREFIX_ADDRESS, 16, 4, key, digestsize, DUMP_FLAG_ASCII); } dma_unmap_single(jrdev, key_dma, *keylen, DMA_BIDIRECTIONAL); =20 @@ -505,7 +491,7 @@ static int axcbc_setkey(struct crypto_ahash *ahash, con= st u8 *key, ctx->adata.keylen =3D keylen; =20 print_hex_dump_debug("axcbc ctx.key@" __stringify(__LINE__)" : ", - DUMP_PREFIX_ADDRESS, 16, 4, ctx->key, keylen, 1); + DUMP_PREFIX_ADDRESS, 16, 4, ctx->key, keylen, DUMP_FLAG_ASCII); =20 return axcbc_set_sh_desc(ahash); } @@ -525,7 +511,7 @@ static int acmac_setkey(struct crypto_ahash *ahash, con= st u8 *key, ctx->adata.keylen =3D keylen; =20 print_hex_dump_debug("acmac ctx.key@" __stringify(__LINE__)" : ", - DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, 1); + DUMP_PREFIX_ADDRESS, 16, 4, key, keylen, DUMP_FLAG_ASCII); =20 return acmac_set_sh_desc(ahash); } @@ -606,9 +592,8 @@ static inline void ahash_done_cpy(struct device *jrdev,= u32 *desc, u32 err, memcpy(req->result, state->caam_ctx, digestsize); kfree(edesc); =20 - print_hex_dump_debug("ctx@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, state->caam_ctx, - ctx->ctx_len, 1); + print_hex_dump_debug("ctx@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS= , 16, 4, + state->caam_ctx, ctx->ctx_len, DUMP_FLAG_ASCII); =20 /* * If no backlog flag, the completion of the request is done @@ -660,17 +645,14 @@ static inline void ahash_done_switch(struct device *j= rdev, u32 *desc, u32 err, state->next_buflen, 0); state->buflen =3D state->next_buflen; =20 - print_hex_dump_debug("buf@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, state->buf, - state->buflen, 1); + print_hex_dump_debug("buf@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRES= S, 16, 4, + state->buf, state->buflen, DUMP_FLAG_ASCII); =20 - print_hex_dump_debug("ctx@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, state->caam_ctx, - ctx->ctx_len, 1); + print_hex_dump_debug("ctx@"__stringify(__LINE__)": ", DUMP_PREFIX_ADDRESS= , 16, 4, + state->caam_ctx, ctx->ctx_len, DUMP_FLAG_ASCII); if (req->result) - print_hex_dump_debug("result@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, req->result, - digestsize, 1); + print_hex_dump_debug("result@"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + req->result, digestsize, DUMP_FLAG_ASCII); =20 /* * If no backlog flag, the completion of the request is done @@ -919,9 +901,8 @@ static int ahash_update_ctx(struct ahash_request *req) =20 append_seq_out_ptr(desc, state->ctx_dma, ctx->ctx_len, 0); =20 - print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, + 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 ret =3D ahash_enqueue_req(jrdev, ahash_done_bi, req, ctx->ctx_len, DMA_BIDIRECTIONAL); @@ -930,9 +911,8 @@ static int ahash_update_ctx(struct ahash_request *req) req->nbytes, 0); *buflen =3D *next_buflen; =20 - print_hex_dump_debug("buf@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, buf, - *buflen, 1); + print_hex_dump_debug("buf@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRE= SS, + 16, 4, buf, *buflen, DUMP_FLAG_ASCII); } =20 return ret; @@ -991,9 +971,8 @@ static int ahash_final_ctx(struct ahash_request *req) LDST_SGF); append_seq_out_ptr(desc, state->ctx_dma, digestsize, 0); =20 - print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 return ahash_enqueue_req(jrdev, ahash_done_ctx_src, req, digestsize, DMA_BIDIRECTIONAL); @@ -1065,9 +1044,8 @@ static int ahash_finup_ctx(struct ahash_request *req) =20 append_seq_out_ptr(desc, state->ctx_dma, digestsize, 0); =20 - print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 return ahash_enqueue_req(jrdev, ahash_done_ctx_src, req, digestsize, DMA_BIDIRECTIONAL); @@ -1135,9 +1113,8 @@ static int ahash_digest(struct ahash_request *req) return -ENOMEM; } =20 - print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 return ahash_enqueue_req(jrdev, ahash_done, req, digestsize, DMA_FROM_DEVICE); @@ -1180,9 +1157,8 @@ static int ahash_final_no_ctx(struct ahash_request *r= eq) if (ret) goto unmap; =20 - print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 return ahash_enqueue_req(jrdev, ahash_done, req, digestsize, DMA_FROM_DEVICE); @@ -1285,9 +1261,8 @@ static int ahash_update_no_ctx(struct ahash_request *= req) if (ret) goto unmap_ctx; =20 - print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, + 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 ret =3D ahash_enqueue_req(jrdev, ahash_done_ctx_dst, req, ctx->ctx_len, DMA_TO_DEVICE); @@ -1301,9 +1276,8 @@ static int ahash_update_no_ctx(struct ahash_request *= req) req->nbytes, 0); *buflen =3D *next_buflen; =20 - print_hex_dump_debug("buf@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, buf, - *buflen, 1); + print_hex_dump_debug("buf@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRE= SS, + 16, 4, buf, *buflen, DUMP_FLAG_ASCII); } =20 return ret; @@ -1376,9 +1350,8 @@ static int ahash_finup_no_ctx(struct ahash_request *r= eq) if (ret) goto unmap; =20 - print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 return ahash_enqueue_req(jrdev, ahash_done, req, digestsize, DMA_FROM_DEVICE); @@ -1465,9 +1438,8 @@ static int ahash_update_first(struct ahash_request *r= eq) if (ret) goto unmap_ctx; =20 - print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, - desc_bytes(desc), 1); + print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, + 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 ret =3D ahash_enqueue_req(jrdev, ahash_done_ctx_dst, req, ctx->ctx_len, DMA_TO_DEVICE); @@ -1484,9 +1456,8 @@ static int ahash_update_first(struct ahash_request *r= eq) req->nbytes, 0); *buflen =3D *next_buflen; =20 - print_hex_dump_debug("buf@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, buf, - *buflen, 1); + print_hex_dump_debug("buf@" __stringify(__LINE__)": ", DUMP_PREFIX_ADDRE= SS, 16, 4, + buf, *buflen, DUMP_FLAG_ASCII); } =20 return ret; diff --git a/drivers/crypto/caam/caampkc.c b/drivers/crypto/caam/caampkc.c index cb001aa1de6618fcb257af730a1519a7d92f5dfd..e8f92849d5a4c1135d36564daa4= fe442f00c5596 100644 --- a/drivers/crypto/caam/caampkc.c +++ b/drivers/crypto/caam/caampkc.c @@ -358,7 +358,7 @@ static struct rsa_edesc *rsa_edesc_alloc(struct akciphe= r_request *req, =20 print_hex_dump_debug("caampkc sec4_sg@" __stringify(__LINE__) ": ", DUMP_PREFIX_ADDRESS, 16, 4, edesc->sec4_sg, - edesc->sec4_sg_bytes, 1); + edesc->sec4_sg_bytes, DUMP_FLAG_ASCII); =20 return edesc; =20 diff --git a/drivers/crypto/caam/caamprng.c b/drivers/crypto/caam/caamprng.c index 6e4c1191cb280e7d8a79b9681edef426219a503f..7042cac625316ca1c1091b9cd38= f9b4bb51daa2f 100644 --- a/drivers/crypto/caam/caamprng.c +++ b/drivers/crypto/caam/caamprng.c @@ -53,7 +53,7 @@ static u32 *caam_init_reseed_desc(u32 *desc) OP_ALG_AS_FINALIZE); =20 print_hex_dump_debug("prng reseed desc@: ", DUMP_PREFIX_ADDRESS, - 16, 4, desc, desc_bytes(desc), 1); + 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 return desc; } @@ -68,7 +68,7 @@ static u32 *caam_init_prng_desc(u32 *desc, dma_addr_t dst= _dma, u32 len) len, FIFOST_TYPE_RNGSTORE); =20 print_hex_dump_debug("prng job desc@: ", DUMP_PREFIX_ADDRESS, - 16, 4, desc, desc_bytes(desc), 1); + 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 return desc; } diff --git a/drivers/crypto/caam/caamrng.c b/drivers/crypto/caam/caamrng.c index b3d14a7f4dd1470ba3def1243e182883ff777761..6efd4048a0121e2c189813908d5= 17d5904638069 100644 --- a/drivers/crypto/caam/caamrng.c +++ b/drivers/crypto/caam/caamrng.c @@ -76,7 +76,7 @@ static u32 *caam_init_desc(u32 *desc, dma_addr_t dst_dma) CAAM_RNG_MAX_FIFO_STORE_SIZE, FIFOST_TYPE_RNGSTORE); =20 print_hex_dump_debug("rng job desc@: ", DUMP_PREFIX_ADDRESS, - 16, 4, desc, desc_bytes(desc), 1); + 16, 4, desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 return desc; } @@ -194,7 +194,7 @@ static inline void test_len(struct hwrng *rng, size_t l= en, bool wait) =20 print_hex_dump_debug("random bytes@: ", DUMP_PREFIX_ADDRESS, 16, 4, - buf, read_len, 1); + buf, read_len, DUMP_FLAG_ASCII); =20 len =3D len - read_len; } diff --git a/drivers/crypto/caam/error.c b/drivers/crypto/caam/error.c index 72db90176b1a104cdbc7befb26e92236ca9ac54e..81b3ad81e98c34b221861a8d34a= fba45a2f500b2 100644 --- a/drivers/crypto/caam/error.c +++ b/drivers/crypto/caam/error.c @@ -35,8 +35,8 @@ void caam_dump_sg(const char *prefix_str, int prefix_type, =20 buf =3D it_page + it->offset; len =3D min_t(size_t, tlen, it->length); - print_hex_dump_debug(prefix_str, prefix_type, rowsize, - groupsize, buf, len, ascii); + print_hex_dump_debug(prefix_str, prefix_type, rowsize, groupsize, buf, l= en, + ascii ? DUMP_FLAG_ASCII : 0); tlen -=3D len; =20 kunmap_atomic(it_page); diff --git a/drivers/crypto/caam/key_gen.c b/drivers/crypto/caam/key_gen.c index 88cc4fe2a585df07b8cd3a9909113227b004b837..05e85c2e23731b81f582bdacc00= 2590f941ed208 100644 --- a/drivers/crypto/caam/key_gen.c +++ b/drivers/crypto/caam/key_gen.c @@ -58,8 +58,8 @@ int gen_split_key(struct device *jrdev, u8 *key_out, =20 dev_dbg(jrdev, "split keylen %d split keylen padded %d\n", adata->keylen, adata->keylen_pad); - print_hex_dump_debug("ctx.key@" __stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key_in, keylen, 1); + print_hex_dump_debug("ctx.key@" __stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, 16, 4, + key_in, keylen, DUMP_FLAG_ASCII); =20 if (local_max > max_keylen) return -EINVAL; @@ -100,9 +100,8 @@ int gen_split_key(struct device *jrdev, u8 *key_out, append_fifo_store(desc, dma_addr, adata->keylen, LDST_CLASS_2_CCB | FIFOST_TYPE_SPLIT_KEK); =20 - print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, desc, desc_bytes(desc), - 1); + print_hex_dump_debug("jobdesc@"__stringify(__LINE__)": ", DUMP_PREFIX_ADD= RESS, 16, 4, + desc, desc_bytes(desc), DUMP_FLAG_ASCII); =20 result.err =3D 0; init_completion(&result.completion); @@ -113,9 +112,8 @@ int gen_split_key(struct device *jrdev, u8 *key_out, wait_for_completion(&result.completion); ret =3D result.err; =20 - print_hex_dump_debug("ctx.key@"__stringify(__LINE__)": ", - DUMP_PREFIX_ADDRESS, 16, 4, key_out, - adata->keylen_pad, 1); + print_hex_dump_debug("ctx.key@"__stringify(__LINE__)": ", DUMP_PREFIX_AD= DRESS, 16, 4, + key_out, adata->keylen_pad, DUMP_FLAG_ASCII); } =20 dma_unmap_single(jrdev, dma_addr, local_max, DMA_BIDIRECTIONAL); diff --git a/drivers/crypto/caam/sg_sw_sec4.h b/drivers/crypto/caam/sg_sw_s= ec4.h index 07e1ee99273b62aa793f4d1f9e1fb47c35f5c37f..9787ac11a3cae3015aea5e8f508= 7bbeaaf2efd9e 100644 --- a/drivers/crypto/caam/sg_sw_sec4.h +++ b/drivers/crypto/caam/sg_sw_sec4.h @@ -36,8 +36,8 @@ static inline void dma_to_sec4_sg_one(struct sec4_sg_entr= y *sec4_sg_ptr, SEC4_SG_OFFSET_MASK); } =20 - print_hex_dump_debug("sec4_sg_ptr@: ", DUMP_PREFIX_ADDRESS, 16, 4, - sec4_sg_ptr, sizeof(struct sec4_sg_entry), 1); + print_hex_dump_debug("sec4_sg_ptr@: ", DUMP_PREFIX_ADDRESS, 16, 4, sec4_s= g_ptr, + sizeof(struct sec4_sg_entry), DUMP_FLAG_ASCII); } =20 /* diff --git a/drivers/crypto/ccp/platform-access.c b/drivers/crypto/ccp/plat= form-access.c index 1b8ed33897332efe3ff260607d477defedc3a4dc..085f8771dd8caf453cd8f43cb3c= d3962b0b98489 100644 --- a/drivers/crypto/ccp/platform-access.c +++ b/drivers/crypto/ccp/platform-access.c @@ -100,7 +100,7 @@ int psp_send_platform_access_msg(enum psp_platform_acce= ss_msg msg, iowrite32(upper_32_bits(req_addr), hi); =20 print_hex_dump_debug("->psp ", DUMP_PREFIX_OFFSET, 16, 2, req, - req->header.payload_size, false); + req->header.payload_size, 0); =20 /* Write command register to trigger processing */ cmd_reg =3D FIELD_PREP(PSP_CMDRESP_CMD, msg); @@ -134,7 +134,7 @@ int psp_send_platform_access_msg(enum psp_platform_acce= ss_msg msg, } =20 print_hex_dump_debug("<-psp ", DUMP_PREFIX_OFFSET, 16, 2, req, - req->header.payload_size, false); + req->header.payload_size, 0); =20 ret =3D 0; =20 diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c index 1c5a7189631eca35c40b555a7c6834ca7f7510a5..f8349ce8e04825e2b234f8d6504= 736df907d0850 100644 --- a/drivers/crypto/ccp/psp-dev.c +++ b/drivers/crypto/ccp/psp-dev.c @@ -86,7 +86,7 @@ int psp_extended_mailbox_cmd(struct psp_device *psp, unsi= gned int timeout_msecs, int ret; =20 print_hex_dump_debug("->psp ", DUMP_PREFIX_OFFSET, 16, 2, req, - req->header.payload_size, false); + req->header.payload_size, 0); =20 ret =3D psp_mailbox_command(psp, PSP_CMD_TEE_EXTENDED_CMD, (void *)req, timeout_msecs, ®); @@ -98,7 +98,7 @@ int psp_extended_mailbox_cmd(struct psp_device *psp, unsi= gned int timeout_msecs, } =20 print_hex_dump_debug("<-psp ", DUMP_PREFIX_OFFSET, 16, 2, req, - req->header.payload_size, false); + req->header.payload_size, 0); =20 return 0; } diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index af018afd9cd7fc68c5f9004e2d0a2ee162d8c4b9..2421c012fa3502528a923ce4142= f2319aa929ae8 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -903,7 +903,7 @@ static int __sev_do_cmd_locked(int cmd, void *data, int= *psp_ret) cmd, phys_msb, phys_lsb, psp_timeout); =20 print_hex_dump_debug("(in): ", DUMP_PREFIX_OFFSET, 16, 2, data, - buf_len, false); + buf_len, 0); =20 iowrite32(phys_lsb, sev->io_regs + sev->vdata->cmdbuff_addr_lo_reg); iowrite32(phys_msb, sev->io_regs + sev->vdata->cmdbuff_addr_hi_reg); @@ -991,7 +991,7 @@ static int __sev_do_cmd_locked(int cmd, void *data, int= *psp_ret) } =20 print_hex_dump_debug("(out): ", DUMP_PREFIX_OFFSET, 16, 2, data, - buf_len, false); + buf_len, 0); =20 return ret; } diff --git a/drivers/crypto/ccree/cc_driver.c b/drivers/crypto/ccree/cc_dri= ver.c index 061e68a31c36ccaffa122830852caf20f3ebeeb0..b1cd9911145b3ba3119c92540f1= 1a30dea5225f5 100644 --- a/drivers/crypto/ccree/cc_driver.c +++ b/drivers/crypto/ccree/cc_driver.c @@ -175,7 +175,7 @@ void __dump_byte_array(const char *name, const u8 *buf,= size_t len) snprintf(prefix, sizeof(prefix), "%s[%zu]: ", name, len); =20 print_hex_dump(KERN_DEBUG, prefix, DUMP_PREFIX_ADDRESS, 16, 1, buf, - len, false); + len, 0); } =20 static irqreturn_t cc_isr(int irq, void *dev_id) diff --git a/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c b/drivers= /crypto/intel/qat/qat_common/adf_mstate_mgr.c index 41cc763a74aa25ad44da62d912e472d44d1f0507..f9fb260a63bbaf43115570bd22d= 94fecdd25c2ac 100644 --- a/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c +++ b/drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c @@ -122,9 +122,9 @@ static void adf_mstate_dump_sect(struct adf_mstate_sect= _h *sect, { pr_debug("QAT: LM - %s QAT state section %s\n", prefix, sect->id); print_hex_dump_debug("h-", DUMP_PREFIX_OFFSET, 16, 2, sect, - sizeof(*sect), true); + sizeof(*sect), DUMP_FLAG_ASCII); print_hex_dump_debug("s-", DUMP_PREFIX_OFFSET, 16, 2, sect->state, - sect->size, true); + sect->size, DUMP_FLAG_ASCII); } =20 static inline void __adf_mstate_sect_update(struct adf_mstate_mgr *mgr, diff --git a/drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c b/drivers/c= rypto/marvell/octeontx/otx_cptvf_reqmgr.c index c80baf1ad90b2f0d3ec4cfd4a7cf3a94b1fe5d5c..630a746d8c37559e099caef95b6= 3380db5dff26d 100644 --- a/drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c +++ b/drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c @@ -40,7 +40,7 @@ void otx_cpt_dump_sg_list(struct pci_dev *pdev, struct ot= x_cpt_req_info *req) pr_debug("Buffer hexdump (%d bytes)\n", req->in[i].size); print_hex_dump_debug("", DUMP_PREFIX_NONE, 16, 1, - req->in[i].vptr, req->in[i].size, false); + req->in[i].vptr, req->in[i].size, 0); } =20 pr_debug("Scatter list size %d\n", req->outcnt); @@ -50,7 +50,7 @@ void otx_cpt_dump_sg_list(struct pci_dev *pdev, struct ot= x_cpt_req_info *req) (void *) req->out[i].dma_addr); pr_debug("Buffer hexdump (%d bytes)\n", req->out[i].size); print_hex_dump_debug("", DUMP_PREFIX_NONE, 16, 1, - req->out[i].vptr, req->out[i].size, false); + req->out[i].vptr, req->out[i].size, 0); } } =20 @@ -377,10 +377,10 @@ static int process_request(struct pci_dev *pdev, stru= ct otx_cpt_req_info *req, /* Print debug info if enabled */ otx_cpt_dump_sg_list(pdev, req); pr_debug("Cpt_inst_s hexdump (%d bytes)\n", OTX_CPT_INST_SIZE); - print_hex_dump_debug("", 0, 16, 1, &cptinst, OTX_CPT_INST_SIZE, false); + print_hex_dump_debug("", 0, 16, 1, &cptinst, OTX_CPT_INST_SIZE, 0); pr_debug("Dptr hexdump (%d bytes)\n", cpt_req->dlen); print_hex_dump_debug("", 0, 16, 1, info->in_buffer, - cpt_req->dlen, false); + cpt_req->dlen, 0); =20 /* Send CPT command */ cpt_send_cmd(&cptinst, cptvf); diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c b/drivers= /crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c index 5387c68f3c9df1f3d59860a6687e9bc996cbf373..f5555ac38f01a43ddd122ac612e= e2b2f1be57cb3 100644 --- a/drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c +++ b/drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c @@ -29,7 +29,7 @@ static void otx2_cpt_dump_sg_list(struct pci_dev *pdev, pr_debug("Buffer hexdump (%d bytes)\n", req->in[i].size); print_hex_dump_debug("", DUMP_PREFIX_NONE, 16, 1, - req->in[i].vptr, req->in[i].size, false); + req->in[i].vptr, req->in[i].size, 0); } pr_debug("Scatter list size %d\n", req->out_cnt); for (i =3D 0; i < req->out_cnt; i++) { @@ -38,7 +38,7 @@ static void otx2_cpt_dump_sg_list(struct pci_dev *pdev, req->out[i].dma_addr); pr_debug("Buffer hexdump (%d bytes)\n", req->out[i].size); print_hex_dump_debug("", DUMP_PREFIX_NONE, 16, 1, - req->out[i].vptr, req->out[i].size, false); + req->out[i].vptr, req->out[i].size, 0); } } =20 @@ -168,10 +168,10 @@ static int process_request(struct pci_dev *pdev, stru= ct otx2_cpt_req_info *req, /* Print debug info if enabled */ otx2_cpt_dump_sg_list(pdev, req); pr_debug("Cpt_inst_s hexdump (%d bytes)\n", OTX2_CPT_INST_SIZE); - print_hex_dump_debug("", 0, 16, 1, &cptinst, OTX2_CPT_INST_SIZE, false); + print_hex_dump_debug("", 0, 16, 1, &cptinst, OTX2_CPT_INST_SIZE, 0); pr_debug("Dptr hexdump (%d bytes)\n", cpt_req->dlen); print_hex_dump_debug("", 0, 16, 1, info->in_buffer, - cpt_req->dlen, false); + cpt_req->dlen, 0); =20 /* Send CPT command */ lf->lfs->ops->send_cmd(&cptinst, 1, lf); diff --git a/drivers/crypto/sa2ul.c b/drivers/crypto/sa2ul.c index 091612b066f1e77344f9d44005aba5642f10f115..4b81ce900abf45806532c36a26b= b0f41f335d689 100644 --- a/drivers/crypto/sa2ul.c +++ b/drivers/crypto/sa2ul.c @@ -708,7 +708,7 @@ static void sa_dump_sc(u8 *buf, dma_addr_t dma_addr) #ifdef DEBUG dev_info(sa_k3_dev, "Security context dump:: 0x%pad\n", &dma_addr); print_hex_dump(KERN_CONT, "", DUMP_PREFIX_OFFSET, - 16, 1, buf, SA_CTX_MAX_SZ, false); + 16, 1, buf, SA_CTX_MAX_SZ, 0); #endif } =20 diff --git a/drivers/dma/loongson1-apb-dma.c b/drivers/dma/loongson1-apb-dm= a.c index 255fe7eca212a9a628dbed7dce21bead04b0ae23..34127814ddb29b2bf72314fa53d= 7a3fd20fac99c 100644 --- a/drivers/dma/loongson1-apb-dma.c +++ b/drivers/dma/loongson1-apb-dma.c @@ -286,7 +286,7 @@ static int ls1x_dma_prep_lli(struct dma_chan *dchan, st= ruct ls1x_dma_desc *desc, list_for_each(pos, &desc->lli_list) { lli =3D list_entry(pos, struct ls1x_dma_lli, node); print_hex_dump_debug("LLI: ", DUMP_PREFIX_OFFSET, 16, 4, - lli, sizeof(*lli), false); + lli, sizeof(*lli), 0); } =20 return 0; diff --git a/drivers/firmware/efi/apple-properties.c b/drivers/firmware/efi= /apple-properties.c index ea84108035eb0329f61e6c3bac945ae525a786d8..eb335ff66099e61cdfdd73eb3fc= efbdd4fb7feae 100644 --- a/drivers/firmware/efi/apple-properties.c +++ b/drivers/firmware/efi/apple-properties.c @@ -98,7 +98,7 @@ static void __init unmarshal_key_value_pairs(struct dev_h= eader *dev_header, if (dump_properties) { dev_info(dev, "property: %s\n", key); print_hex_dump(KERN_INFO, pr_fmt(), DUMP_PREFIX_OFFSET, - 16, 1, entry_data, entry_len, true); + 16, 1, entry_data, entry_len, DUMP_FLAG_ASCII); } =20 ptr +=3D key_len + val_len; @@ -108,7 +108,7 @@ static void __init unmarshal_key_value_pairs(struct dev= _header *dev_header, dev_err(dev, "got %d device properties, expected %u\n", i, dev_header->prop_count); print_hex_dump(KERN_ERR, pr_fmt(), DUMP_PREFIX_OFFSET, - 16, 1, dev_header, dev_header->len, true); + 16, 1, dev_header, dev_header->len, DUMP_FLAG_ASCII); return; } =20 @@ -141,7 +141,7 @@ static int __init unmarshal_devices(struct properties_h= eader *properties) pr_err("device path parse error %ld at %#zx:\n", PTR_ERR(dev), (void *)ptr - (void *)dev_header); print_hex_dump(KERN_ERR, pr_fmt(), DUMP_PREFIX_OFFSET, - 16, 1, dev_header, dev_header->len, true); + 16, 1, dev_header, dev_header->len, DUMP_FLAG_ASCII); dev =3D NULL; goto skip_device; } @@ -211,12 +211,12 @@ static int __init map_properties(void) if (properties->version !=3D 1) { pr_err("unsupported version:\n"); print_hex_dump(KERN_ERR, pr_fmt(), DUMP_PREFIX_OFFSET, - 16, 1, properties, data_len, true); + 16, 1, properties, data_len, DUMP_FLAG_ASCII); ret =3D -ENOTSUPP; } else if (properties->len !=3D data_len) { pr_err("length mismatch, expected %u\n", data_len); print_hex_dump(KERN_ERR, pr_fmt(), DUMP_PREFIX_OFFSET, - 16, 1, properties, data_len, true); + 16, 1, properties, data_len, DUMP_FLAG_ASCII); ret =3D -EINVAL; } else ret =3D unmarshal_devices(properties); diff --git a/drivers/firmware/efi/cper-arm.c b/drivers/firmware/efi/cper-ar= m.c index fa9c1c3bf168b0d06303a2d1ccaa24b18318ef9a..b29de3659c8ed624cfa0a32938f= 2e7c98baf251c 100644 --- a/drivers/firmware/efi/cper-arm.c +++ b/drivers/firmware/efi/cper-arm.c @@ -336,6 +336,6 @@ void cper_print_proc_arm(const char *pfx, printk("%sVendor specific error info has %u bytes:\n", pfx, len); print_hex_dump(newpfx, "", DUMP_PREFIX_OFFSET, 16, 4, ctx_info, - len, true); + len, DUMP_FLAG_ASCII); } } diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c index b69e68ef3f02bed94bcaa8cd2a6694959fc1e748..be842f9fd95d4ed0ac4b06bc7fd= 140308f5345fd 100644 --- a/drivers/firmware/efi/cper.c +++ b/drivers/firmware/efi/cper.c @@ -504,7 +504,7 @@ static void cper_print_fw_err(const char *pfx, buf +=3D offset; length -=3D offset; =20 - print_hex_dump(pfx, "", DUMP_PREFIX_OFFSET, 16, 4, buf, length, true); + print_hex_dump(pfx, "", DUMP_PREFIX_OFFSET, 16, 4, buf, length, DUMP_FLAG= _ASCII); } =20 static void cper_print_tstamp(const char *pfx, @@ -638,7 +638,7 @@ cper_estatus_print_section(const char *pfx, struct acpi= _hest_generic_data *gdata printk("%ssection length: %#x\n", newpfx, gdata->error_data_length); print_hex_dump(newpfx, "", DUMP_PREFIX_OFFSET, 16, 4, err, - gdata->error_data_length, true); + gdata->error_data_length, DUMP_FLAG_ASCII); } =20 return; diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c b/drivers/gpu/drm/a= md/amdgpu/smu_v11_0_i2c.c index dd2d66090d23749c318eab2fe7a93c76cb8be205..45f5b6b6d979fbb5e260784b36a= 3a696725085f2 100644 --- a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c +++ b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c @@ -281,7 +281,7 @@ static uint32_t smu_v11_0_i2c_transmit(struct i2c_adapt= er *control, =20 if (drm_debug_enabled(DRM_UT_DRIVER)) { print_hex_dump(KERN_INFO, "data: ", DUMP_PREFIX_NONE, - 16, 1, data, numbytes, false); + 16, 1, data, numbytes, 0); } =20 /* Set the I2C slave address */ @@ -432,7 +432,7 @@ static uint32_t smu_v11_0_i2c_receive(struct i2c_adapte= r *control, =20 if (drm_debug_enabled(DRM_UT_DRIVER)) { print_hex_dump(KERN_INFO, "data: ", DUMP_PREFIX_NONE, - 16, 1, data, bytes_received, false); + 16, 1, data, bytes_received, 0); } =20 return ret; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index f0a6816709ca7dad6415d16f9806f18065026cf7..c537b3d5d89df4b0df547b4609b= 48d544e05d0d5 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -7503,7 +7503,7 @@ static int fill_hdr_info_packet(const struct drm_conn= ector_state *state, out->valid =3D true; =20 print_hex_dump(KERN_DEBUG, "HDR SB:", DUMP_PREFIX_NONE, 16, 1, out->sb, - sizeof(out->sb), false); + sizeof(out->sb), 0); =20 return 0; } diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/b= ridge/lontium-lt9611uxc.c index 4d1d40e1f1b4d144f4aa9de7b83bedf13dfa4436..096a37c3e9435c5f2530dcf9160= b453c60d9eec2 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c @@ -711,7 +711,8 @@ static int lt9611uxc_firmware_update(struct lt9611uxc *= lt9611uxc) =20 if (!memcmp(readbuf, fw->data, fw->size)) { dev_err(lt9611uxc->dev, "Firmware update failed\n"); - print_hex_dump(KERN_ERR, "fw: ", DUMP_PREFIX_OFFSET, 16, 1, readbuf, fw-= >size, false); + print_hex_dump(KERN_ERR, "fw: ", DUMP_PREFIX_OFFSET, 16, 1, readbuf, fw-= >size, + 0); ret =3D -EINVAL; } else { dev_info(lt9611uxc->dev, "Firmware updates successfully\n"); diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/dr= m/display/drm_dp_mst_topology.c index ac90118b9e7a81f2de9e2e0615b298cdba6e0499..4f022d42ef4a46ba41fc2553dcd= dd0d87312f05e 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -786,7 +786,7 @@ static bool drm_dp_sideband_append_payload(struct drm_d= p_sideband_msg_rx *msg, if (crc4 !=3D msg->chunk[msg->curchunk_len - 1]) print_hex_dump(KERN_DEBUG, "wrong crc", DUMP_PREFIX_NONE, 16, 1, - msg->chunk, msg->curchunk_len, false); + msg->chunk, msg->curchunk_len, 0); /* copy chunk into bigger msg */ memcpy(&msg->msg[msg->curlen], msg->chunk, msg->curchunk_len - 1); msg->curlen +=3D msg->curchunk_len - 1; @@ -3884,7 +3884,7 @@ drm_dp_get_one_sb_msg(struct drm_dp_mst_topology_mgr = *mgr, bool up, ret =3D drm_dp_decode_sideband_msg_hdr(mgr, &hdr, replyblock, len, &hdrle= n); if (ret =3D=3D false) { print_hex_dump(KERN_DEBUG, "failed hdr", DUMP_PREFIX_NONE, 16, - 1, replyblock, len, false); + 1, replyblock, len, 0); drm_dbg_kms(mgr->dev, "ERROR: failed header\n"); return false; } diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 855beafb76ffbecf5c08d58e2f54bfb76f30b930..6deebe350fc4ece61a9ee994274= 66d5925c8ac8a 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1963,7 +1963,7 @@ static void edid_block_dump(const char *level, const = void *block, int block_num) sprintf(prefix, "\t[%02x] GOOD ", block_num); =20 print_hex_dump(level, prefix, DUMP_PREFIX_NONE, 16, 1, - block, EDID_LENGTH, false); + block, EDID_LENGTH, 0); } =20 /* diff --git a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c b/drivers= /gpu/drm/i915/display/intel_crtc_state_dump.c index 705ec5ad385c83b7f710b6946a69a4e10de07a9d..7727fd9f05598241d4442843696= 37feda97c2ad4 100644 --- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c +++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c @@ -57,7 +57,7 @@ intel_dump_buffer(const char *prefix, const u8 *buf, size= _t len) return; =20 print_hex_dump(KERN_DEBUG, prefix, DUMP_PREFIX_NONE, - 16, 0, buf, len, false); + 16, 0, buf, len, 0); } =20 #define OUTPUT_TYPE(x) [INTEL_OUTPUT_ ## x] =3D #x diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm= /i915/display/intel_display.c index 863927f429aa7344c52599ba34f421c5d565e737..12db699af1e999228f13bfc25ba= 8d95b7edf6296 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5277,9 +5277,9 @@ pipe_config_buffer_mismatch(struct drm_printer *p, bo= ol fastset, len =3D memcmp_diff_len(a, b, len); =20 print_hex_dump(loglevel, "expected: ", DUMP_PREFIX_NONE, - 16, 0, a, len, false); + 16, 0, a, len, 0); print_hex_dump(loglevel, "found: ", DUMP_PREFIX_NONE, - 16, 0, b, len, false); + 16, 0, b, len, 0); } =20 static void diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/d= rm/nouveau/nvkm/subdev/gsp/r535.c index d586aea3089841a9457db53282ec264740c701f7..b65552201fe6b29fa89c7c42280= b039cc68e110e 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c @@ -264,7 +264,7 @@ r535_gsp_msg_dump(struct nvkm_gsp *gsp, struct nvfw_gsp= _rpc *msg, int lvl) msg->function, msg->length, msg->length - sizeof(*msg), msg->rpc_result, msg->rpc_result_private); print_hex_dump(KERN_INFO, "msg: ", DUMP_PREFIX_OFFSET, 16, 1, - msg->data, msg->length - sizeof(*msg), true); + msg->data, msg->length - sizeof(*msg), DUMP_FLAG_ASCII); } } =20 @@ -378,7 +378,7 @@ r535_gsp_rpc_send(struct nvkm_gsp *gsp, void *argv, boo= l wait, u32 repc) nvkm_trace(&gsp->subdev, "rpc fn:%d len:0x%x/0x%zx\n", rpc->function, rpc->length, rpc->length - sizeof(*rpc)); print_hex_dump(KERN_INFO, "rpc: ", DUMP_PREFIX_OFFSET, 16, 1, - rpc->data, rpc->length - sizeof(*rpc), true); + rpc->data, rpc->length - sizeof(*rpc), DUMP_FLAG_ASCII); } =20 ret =3D r535_gsp_cmdq_push(gsp, rpc); diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c b/drivers/gpu/drm/oma= pdrm/dss/hdmi4_core.c index 8720bf4f18fe8b3d03b968e01cc1e46a14031a53..38e9c95f7a1aef16e930023539e= 27d06f1ed12f1 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c @@ -227,7 +227,7 @@ static void hdmi_core_write_avi_infoframe(struct hdmi_c= ore_data *core, hdmi_avi_infoframe_pack(frame, data, sizeof(data)); =20 print_hex_dump_debug("AVI: ", DUMP_PREFIX_NONE, 16, 1, data, - HDMI_INFOFRAME_SIZE(AVI), false); + HDMI_INFOFRAME_SIZE(AVI), 0); =20 for (i =3D 0; i < sizeof(data); ++i) { hdmi_write_reg(av_base, HDMI_CORE_AV_AVI_BASE + i * 4, diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c b/drivers/gpu/drm/oma= pdrm/dss/hdmi5_core.c index 21564c38234fa92f0741c6415c52471c2d618c71..ca2ca63a80976adff888d5e0f8b= 53443acbb999c 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5_core.c @@ -376,7 +376,7 @@ static void hdmi_core_write_avi_infoframe(struct hdmi_c= ore_data *core, hdmi_avi_infoframe_pack(frame, data, sizeof(data)); =20 print_hex_dump_debug("AVI: ", DUMP_PREFIX_NONE, 16, 1, data, - HDMI_INFOFRAME_SIZE(AVI), false); + HDMI_INFOFRAME_SIZE(AVI), 0); =20 ptr =3D data + HDMI_INFOFRAME_HEADER_SIZE; =20 diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c index 3c6011a48dabe749325782ea90d9de228eb3e761..ec3ee0cb44b30453c5760e5d22e= cbccde72eadf2 100644 --- a/drivers/hv/channel_mgmt.c +++ b/drivers/hv/channel_mgmt.c @@ -1095,13 +1095,10 @@ static void vmbus_onoffer(struct vmbus_channel_mess= age_header *hdr) pr_debug("vmbus offer changed: relid=3D%d\n", offer->child_relid); =20 - print_hex_dump_debug("Old vmbus offer: ", - DUMP_PREFIX_OFFSET, 16, 4, - &oldchannel->offermsg, offer_sz, - false); - print_hex_dump_debug("New vmbus offer: ", - DUMP_PREFIX_OFFSET, 16, 4, - offer, offer_sz, false); + print_hex_dump_debug("Old vmbus offer: ", DUMP_PREFIX_OFFSET, 16, 4, + &oldchannel->offermsg, offer_sz, 0); + print_hex_dump_debug("New vmbus offer: ", DUMP_PREFIX_OFFSET, 16, 4, + offer, offer_sz, 0); =20 /* Fix up the old channel. */ vmbus_setup_channel_state(oldchannel, offer); diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniban= d/hw/hns/hns_roce_hw_v2.c index 697b17cca02e71af8156771f15f98f109f65e6e9..945084bd9789d50b760e36051c3= 05fd57c1ce65c 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -3739,8 +3739,7 @@ static void get_cqe_status(struct hns_roce_dev *hr_de= v, struct hns_roce_qp *qp, =20 ibdev_err_ratelimited(&hr_dev->ib_dev, "error cqe status 0x%x:\n", cqe_status); - print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_NONE, 16, 4, cqe, - cq->cqe_size, false); + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_NONE, 16, 4, cqe, cq->cqe_size= , 0); wc->vendor_err =3D hr_reg_read(cqe, CQE_SUB_STATUS); =20 /* diff --git a/drivers/infiniband/hw/irdma/cm.c b/drivers/infiniband/hw/irdma= /cm.c index ce8d821bdad8476e7d0b61e2ac7eddbafcde5e50..7cffee667770ecb138cbe888f64= 0f6d2473bd79b 100644 --- a/drivers/infiniband/hw/irdma/cm.c +++ b/drivers/infiniband/hw/irdma/cm.c @@ -394,7 +394,7 @@ static struct irdma_puda_buf *irdma_form_ah_cm_frame(st= ruct irdma_cm_node *cm_no refcount_set(&sqbuf->refcount, 1); =20 print_hex_dump_debug("ILQ: TRANSMIT ILQ BUFFER", DUMP_PREFIX_OFFSET, - 16, 8, sqbuf->mem.va, sqbuf->totallen, false); + 16, 8, sqbuf->mem.va, sqbuf->totallen, 0); =20 return sqbuf; } @@ -582,7 +582,7 @@ static struct irdma_puda_buf *irdma_form_uda_cm_frame(s= truct irdma_cm_node *cm_n refcount_set(&sqbuf->refcount, 1); =20 print_hex_dump_debug("ILQ: TRANSMIT ILQ BUFFER", DUMP_PREFIX_OFFSET, - 16, 8, sqbuf->mem.va, sqbuf->totallen, false); + 16, 8, sqbuf->mem.va, sqbuf->totallen, 0); return sqbuf; } =20 @@ -3150,7 +3150,7 @@ void irdma_receive_ilq(struct irdma_sc_vsi *vsi, stru= ct irdma_puda_buf *rbuf) /* if vlan, then maclen =3D 18 else 14 */ iph =3D (struct iphdr *)rbuf->iph; print_hex_dump_debug("ILQ: RECEIVE ILQ BUFFER", DUMP_PREFIX_OFFSET, - 16, 8, rbuf->mem.va, rbuf->totallen, false); + 16, 8, rbuf->mem.va, rbuf->totallen, 0); if (iwdev->rf->sc_dev.hw_attrs.uk_attrs.hw_rev >=3D IRDMA_GEN_2) { if (rbuf->vlan_valid) { vtag =3D rbuf->vlan_id; diff --git a/drivers/infiniband/hw/irdma/ctrl.c b/drivers/infiniband/hw/ird= ma/ctrl.c index 6aed6169c07d7d5154b69708dedb39416bca26f2..d205e4af559db29d089f98af518= d55b95ae6a21f 100644 --- a/drivers/infiniband/hw/irdma/ctrl.c +++ b/drivers/infiniband/hw/irdma/ctrl.c @@ -202,7 +202,7 @@ static int irdma_sc_add_arp_cache_entry(struct irdma_sc= _cqp *cqp, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: ARP_CACHE_ENTRY WQE", DUMP_PREFIX_OFFSET, - 16, 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 16, 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -235,7 +235,7 @@ static int irdma_sc_del_arp_cache_entry(struct irdma_sc= _cqp *cqp, u64 scratch, =20 print_hex_dump_debug("WQE: ARP_CACHE_DEL_ENTRY WQE", DUMP_PREFIX_OFFSET, 16, 8, wqe, - IRDMA_CQP_WQE_SIZE * 8, false); + IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -270,7 +270,7 @@ static int irdma_sc_manage_apbvt_entry(struct irdma_sc_= cqp *cqp, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: MANAGE_APBVT WQE", DUMP_PREFIX_OFFSET, 16, - 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -360,7 +360,7 @@ irdma_sc_manage_qhash_table_entry(struct irdma_sc_cqp *= cqp, set_64bit_val(wqe, 24, temp); =20 print_hex_dump_debug("WQE: MANAGE_QHASH WQE", DUMP_PREFIX_OFFSET, 16, - 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -482,7 +482,7 @@ int irdma_sc_qp_create(struct irdma_sc_qp *qp, struct i= rdma_create_qp_info *info set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: QP_CREATE WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -551,7 +551,7 @@ int irdma_sc_qp_modify(struct irdma_sc_qp *qp, struct i= rdma_modify_qp_info *info set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: QP_MODIFY WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -592,7 +592,7 @@ int irdma_sc_qp_destroy(struct irdma_sc_qp *qp, u64 scr= atch, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: QP_DESTROY WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -750,7 +750,7 @@ void irdma_sc_qp_setctx_roce(struct irdma_sc_qp *qp, __= le64 *qp_ctx, FIELD_PREP(IRDMAQPC_REMENDPOINTIDX, info->rem_endpoint_idx)); =20 print_hex_dump_debug("WQE: QP_HOST CTX WQE", DUMP_PREFIX_OFFSET, 16, - 8, qp_ctx, IRDMA_QP_CTX_SIZE, false); + 8, qp_ctx, IRDMA_QP_CTX_SIZE, 0); } =20 /* irdma_sc_alloc_local_mac_entry - allocate a mac entry @@ -778,7 +778,7 @@ static int irdma_sc_alloc_local_mac_entry(struct irdma_= sc_cqp *cqp, u64 scratch, =20 print_hex_dump_debug("WQE: ALLOCATE_LOCAL_MAC WQE", DUMP_PREFIX_OFFSET, 16, 8, wqe, - IRDMA_CQP_WQE_SIZE * 8, false); + IRDMA_CQP_WQE_SIZE * 8, 0); =20 if (post_sq) irdma_sc_cqp_post_sq(cqp); @@ -815,7 +815,7 @@ static int irdma_sc_add_local_mac_entry(struct irdma_sc= _cqp *cqp, set_64bit_val(wqe, 24, header); =20 print_hex_dump_debug("WQE: ADD_LOCAL_MAC WQE", DUMP_PREFIX_OFFSET, 16, - 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); =20 if (post_sq) irdma_sc_cqp_post_sq(cqp); @@ -853,7 +853,7 @@ static int irdma_sc_del_local_mac_entry(struct irdma_sc= _cqp *cqp, u64 scratch, =20 print_hex_dump_debug("WQE: DEL_LOCAL_MAC_IPADDR WQE", DUMP_PREFIX_OFFSET, 16, 8, wqe, - IRDMA_CQP_WQE_SIZE * 8, false); + IRDMA_CQP_WQE_SIZE * 8, 0); =20 if (post_sq) irdma_sc_cqp_post_sq(cqp); @@ -1042,7 +1042,7 @@ void irdma_sc_qp_setctx(struct irdma_sc_qp *qp, __le6= 4 *qp_ctx, set_64bit_val(qp_ctx, 128, qw16); =20 print_hex_dump_debug("WQE: QP_HOST CTX", DUMP_PREFIX_OFFSET, 16, 8, - qp_ctx, IRDMA_QP_CTX_SIZE, false); + qp_ctx, IRDMA_QP_CTX_SIZE, 0); } =20 /** @@ -1102,7 +1102,7 @@ static int irdma_sc_alloc_stag(struct irdma_sc_dev *d= ev, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: ALLOC_STAG WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -1193,7 +1193,7 @@ static int irdma_sc_mr_reg_non_shared(struct irdma_sc= _dev *dev, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: MR_REG_NS WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -1233,7 +1233,7 @@ static int irdma_sc_dealloc_stag(struct irdma_sc_dev = *dev, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: DEALLOC_STAG WQE", DUMP_PREFIX_OFFSET, 16, - 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -1275,7 +1275,7 @@ static int irdma_sc_mw_alloc(struct irdma_sc_dev *dev, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: MW_ALLOC WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -1349,7 +1349,7 @@ int irdma_sc_mr_fast_register(struct irdma_sc_qp *qp, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: FAST_REG WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_QP_WQE_MIN_SIZE, false); + wqe, IRDMA_QP_WQE_MIN_SIZE, 0); =20 if (post_sq) irdma_uk_qp_post_wr(&qp->qp_uk); @@ -1378,7 +1378,7 @@ static void irdma_sc_gen_rts_ae(struct irdma_sc_qp *q= p) =20 set_64bit_val(wqe, 24, hdr); print_hex_dump_debug("QP: NOP W/LOCAL FENCE WQE", DUMP_PREFIX_OFFSET, - 16, 8, wqe, IRDMA_QP_WQE_MIN_SIZE, false); + 16, 8, wqe, IRDMA_QP_WQE_MIN_SIZE, 0); =20 wqe =3D qp_uk->sq_base[2].elem; hdr =3D FIELD_PREP(IRDMAQPSQ_OPCODE, IRDMAQP_OP_GEN_RTS_AE) | @@ -1387,7 +1387,7 @@ static void irdma_sc_gen_rts_ae(struct irdma_sc_qp *q= p) =20 set_64bit_val(wqe, 24, hdr); print_hex_dump_debug("QP: CONN EST WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_QP_WQE_MIN_SIZE, false); + wqe, IRDMA_QP_WQE_MIN_SIZE, 0); } =20 /** @@ -1429,7 +1429,7 @@ void irdma_sc_send_lsmm(struct irdma_sc_qp *qp, void = *lsmm_buf, u32 size, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: SEND_LSMM WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_QP_WQE_MIN_SIZE, false); + wqe, IRDMA_QP_WQE_MIN_SIZE, 0); =20 if (qp->dev->hw_attrs.uk_attrs.feature_flags & IRDMA_FEATURE_RTS_AE) irdma_sc_gen_rts_ae(qp); @@ -1479,7 +1479,7 @@ void irdma_sc_send_rtt(struct irdma_sc_qp *qp, bool r= ead) set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: RTR WQE", DUMP_PREFIX_OFFSET, 16, 8, wqe, - IRDMA_QP_WQE_MIN_SIZE, false); + IRDMA_QP_WQE_MIN_SIZE, 0); =20 if (qp->dev->hw_attrs.uk_attrs.feature_flags & IRDMA_FEATURE_RTS_AE) irdma_sc_gen_rts_ae(qp); @@ -2074,7 +2074,7 @@ static int irdma_sc_gather_stats(struct irdma_sc_cqp = *cqp, set_64bit_val(wqe, 24, temp); =20 print_hex_dump_debug("STATS: GATHER_STATS WQE", DUMP_PREFIX_OFFSET, - 16, 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 16, 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); =20 irdma_sc_cqp_post_sq(cqp); ibdev_dbg(to_ibdev(cqp->dev), @@ -2116,7 +2116,7 @@ static int irdma_sc_manage_stats_inst(struct irdma_sc= _cqp *cqp, set_64bit_val(wqe, 24, temp); =20 print_hex_dump_debug("WQE: MANAGE_STATS WQE", DUMP_PREFIX_OFFSET, 16, - 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); =20 irdma_sc_cqp_post_sq(cqp); return 0; @@ -2157,7 +2157,7 @@ static int irdma_sc_set_up_map(struct irdma_sc_cqp *c= qp, set_64bit_val(wqe, 24, temp); =20 print_hex_dump_debug("WQE: UPMAP WQE", DUMP_PREFIX_OFFSET, 16, 8, wqe, - IRDMA_CQP_WQE_SIZE * 8, false); + IRDMA_CQP_WQE_SIZE * 8, 0); irdma_sc_cqp_post_sq(cqp); =20 return 0; @@ -2199,7 +2199,7 @@ static int irdma_sc_manage_ws_node(struct irdma_sc_cq= p *cqp, set_64bit_val(wqe, 24, temp); =20 print_hex_dump_debug("WQE: MANAGE_WS WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); irdma_sc_cqp_post_sq(cqp); =20 return 0; @@ -2272,7 +2272,7 @@ int irdma_sc_qp_flush_wqes(struct irdma_sc_qp *qp, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: QP_FLUSH WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -2313,7 +2313,7 @@ static int irdma_sc_gen_ae(struct irdma_sc_qp *qp, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: GEN_AE WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -2352,7 +2352,7 @@ static int irdma_sc_qp_upload_context(struct irdma_sc= _dev *dev, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: QP_UPLOAD_CTX WQE", DUMP_PREFIX_OFFSET, 16, - 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -2392,7 +2392,7 @@ static int irdma_sc_manage_push_page(struct irdma_sc_= cqp *cqp, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: MANAGE_PUSH_PAGES WQE", DUMP_PREFIX_OFFSET, - 16, 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 16, 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -2423,7 +2423,7 @@ static int irdma_sc_suspend_qp(struct irdma_sc_cqp *c= qp, struct irdma_sc_qp *qp, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: SUSPEND_QP WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); irdma_sc_cqp_post_sq(cqp); =20 return 0; @@ -2456,7 +2456,7 @@ static int irdma_sc_resume_qp(struct irdma_sc_cqp *cq= p, struct irdma_sc_qp *qp, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: RESUME_QP WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); irdma_sc_cqp_post_sq(cqp); =20 return 0; @@ -2573,7 +2573,7 @@ static int irdma_sc_cq_create(struct irdma_sc_cq *cq,= u64 scratch, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: CQ_CREATE WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -2624,7 +2624,7 @@ int irdma_sc_cq_destroy(struct irdma_sc_cq *cq, u64 s= cratch, bool post_sq) set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: CQ_DESTROY WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -2698,7 +2698,7 @@ static int irdma_sc_cq_modify(struct irdma_sc_cq *cq, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: CQ_MODIFY WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -3203,7 +3203,7 @@ int irdma_sc_cqp_create(struct irdma_sc_cqp *cqp, u16= *maj_err, u16 *min_err) } set_64bit_val(cqp->host_ctx, 56, temp); print_hex_dump_debug("WQE: CQP_HOST_CTX WQE", DUMP_PREFIX_OFFSET, 16, - 8, cqp->host_ctx, IRDMA_CQP_CTX_SIZE * 8, false); + 8, cqp->host_ctx, IRDMA_CQP_CTX_SIZE * 8, 0); p1 =3D cqp->host_ctx_pa >> 32; p2 =3D (u32)cqp->host_ctx_pa; =20 @@ -3483,7 +3483,7 @@ static int irdma_sc_manage_hmc_pm_func_table(struct i= rdma_sc_cqp *cqp, =20 print_hex_dump_debug("WQE: MANAGE_HMC_PM_FUNC_TABLE WQE", DUMP_PREFIX_OFFSET, 16, 8, wqe, - IRDMA_CQP_WQE_SIZE * 8, false); + IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -3536,7 +3536,7 @@ static int irdma_sc_commit_fpm_val(struct irdma_sc_cq= p *cqp, u64 scratch, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: COMMIT_FPM_VAL WQE", DUMP_PREFIX_OFFSET, - 16, 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 16, 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); irdma_get_cqp_reg_info(cqp, &val, &tail, &error); =20 if (post_sq) { @@ -3595,7 +3595,7 @@ static int irdma_sc_query_fpm_val(struct irdma_sc_cqp= *cqp, u64 scratch, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: QUERY_FPM WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); irdma_get_cqp_reg_info(cqp, &val, &tail, &error); =20 if (post_sq) { @@ -3693,7 +3693,7 @@ static int irdma_sc_ceq_create(struct irdma_sc_ceq *c= eq, u64 scratch, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: CEQ_CREATE WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -3785,7 +3785,7 @@ int irdma_sc_ceq_destroy(struct irdma_sc_ceq *ceq, u6= 4 scratch, bool post_sq) set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: CEQ_DESTROY WQE", DUMP_PREFIX_OFFSET, 16, - 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -3952,7 +3952,7 @@ static int irdma_sc_aeq_create(struct irdma_sc_aeq *a= eq, u64 scratch, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: AEQ_CREATE WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); =20 @@ -3991,7 +3991,7 @@ static int irdma_sc_aeq_destroy(struct irdma_sc_aeq *= aeq, u64 scratch, set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: AEQ_DESTROY WQE", DUMP_PREFIX_OFFSET, 16, - 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); if (post_sq) irdma_sc_cqp_post_sq(cqp); return 0; @@ -4023,7 +4023,7 @@ int irdma_sc_get_next_aeqe(struct irdma_sc_aeq *aeq, get_64bit_val(aeqe, 0, &compl_ctx); =20 print_hex_dump_debug("WQE: AEQ_ENTRY WQE", DUMP_PREFIX_OFFSET, 16, 8, - aeqe, 16, false); + aeqe, 16, 0); =20 ae_src =3D (u8)FIELD_GET(IRDMA_AEQE_AESRC, temp); info->wqe_idx =3D (u16)FIELD_GET(IRDMA_AEQE_WQDESCIDX, temp); @@ -4286,7 +4286,7 @@ int irdma_sc_ccq_destroy(struct irdma_sc_cq *ccq, u64= scratch, bool post_sq) set_64bit_val(wqe, 24, hdr); =20 print_hex_dump_debug("WQE: CCQ_DESTROY WQE", DUMP_PREFIX_OFFSET, 16, - 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); irdma_get_cqp_reg_info(cqp, &val, &tail, &error); =20 if (post_sq) { @@ -4331,7 +4331,7 @@ int irdma_sc_init_iw_hmc(struct irdma_sc_dev *dev, u8= hmc_fn_id) =20 print_hex_dump_debug("HMC: QUERY FPM BUFFER", DUMP_PREFIX_OFFSET, 16, 8, query_fpm_mem.va, IRDMA_QUERY_FPM_BUF_SIZE, - false); + 0); return ret_code; } =20 @@ -4390,7 +4390,7 @@ static int irdma_sc_cfg_iw_fpm(struct irdma_sc_dev *d= ev, u8 hmc_fn_id) wait_type =3D (u8)IRDMA_CQP_WAIT_POLL_REGS; print_hex_dump_debug("HMC: COMMIT FPM BUFFER", DUMP_PREFIX_OFFSET, 16, 8, commit_fpm_mem.va, IRDMA_COMMIT_FPM_BUF_SIZE, - false); + 0); ret_code =3D irdma_sc_commit_fpm_val(dev->cqp, 0, hmc_info->hmc_fn_id, &commit_fpm_mem, true, wait_type); if (!ret_code) @@ -4399,7 +4399,7 @@ static int irdma_sc_cfg_iw_fpm(struct irdma_sc_dev *d= ev, u8 hmc_fn_id) &hmc_info->sd_table.sd_cnt); print_hex_dump_debug("HMC: COMMIT FPM BUFFER", DUMP_PREFIX_OFFSET, 16, 8, commit_fpm_mem.va, IRDMA_COMMIT_FPM_BUF_SIZE, - false); + 0); =20 return ret_code; } @@ -4475,10 +4475,10 @@ static int cqp_sds_wqe_fill(struct irdma_sc_cqp *cq= p, print_hex_dump_debug("WQE: UPDATE_PE_SDS WQE Buffer", DUMP_PREFIX_OFFSET, 16, 8, (char *)sdbuf->va + offset, - mem_entries << 4, false); + mem_entries << 4, 0); =20 print_hex_dump_debug("WQE: UPDATE_PE_SDS WQE", DUMP_PREFIX_OFFSET, 16, - 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); =20 return 0; } @@ -4557,7 +4557,7 @@ int irdma_sc_static_hmc_pages_allocated(struct irdma_= sc_cqp *cqp, u64 scratch, =20 print_hex_dump_debug("WQE: SHMC_PAGES_ALLOCATED WQE", DUMP_PREFIX_OFFSET, 16, 8, wqe, - IRDMA_CQP_WQE_SIZE * 8, false); + IRDMA_CQP_WQE_SIZE * 8, 0); irdma_get_cqp_reg_info(cqp, &val, &tail, &error); =20 if (post_sq) { @@ -4653,7 +4653,7 @@ static int irdma_sc_query_rdma_features(struct irdma_= sc_cqp *cqp, set_64bit_val(wqe, 24, temp); =20 print_hex_dump_debug("WQE: QUERY RDMA FEATURES", DUMP_PREFIX_OFFSET, - 16, 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + 16, 8, wqe, IRDMA_CQP_WQE_SIZE * 8, 0); irdma_sc_cqp_post_sq(cqp); =20 return 0; @@ -4717,7 +4717,7 @@ int irdma_get_rdma_features(struct irdma_sc_dev *dev) } =20 print_hex_dump_debug("WQE: QUERY RDMA FEATURES", DUMP_PREFIX_OFFSET, - 16, 8, feat_buf.va, feat_cnt * 8, false); + 16, 8, feat_buf.va, feat_cnt * 8, 0); =20 for (byte_idx =3D 0, feat_idx =3D 0; feat_idx < min(feat_cnt, (u16)IRDMA_= MAX_FEATURES); feat_idx++, byte_idx +=3D 8) { diff --git a/drivers/infiniband/hw/irdma/puda.c b/drivers/infiniband/hw/ird= ma/puda.c index 7e3f9bca2c235edb3d2edc91838988f74971f963..fad737e365f0910fe4f0f801c63= d098e00a0eab3 100644 --- a/drivers/infiniband/hw/irdma/puda.c +++ b/drivers/infiniband/hw/irdma/puda.c @@ -256,11 +256,10 @@ static int irdma_puda_poll_info(struct irdma_sc_cq *c= q, IRDMA_RING_MOVE_TAIL(cq_uk->cq_ring); } =20 - print_hex_dump_debug("PUDA: PUDA CQE", DUMP_PREFIX_OFFSET, 16, 8, cqe, - 32, false); + print_hex_dump_debug("PUDA: PUDA CQE", DUMP_PREFIX_OFFSET, 16, 8, cqe, 32= , 0); if (ext_valid) print_hex_dump_debug("PUDA: PUDA EXT-CQE", DUMP_PREFIX_OFFSET, - 16, 8, ext_cqe, 32, false); + 16, 8, ext_cqe, 32, 0); =20 error =3D (bool)FIELD_GET(IRDMA_CQ_ERROR, qword3); if (error) { @@ -487,8 +486,7 @@ int irdma_puda_send(struct irdma_sc_qp *qp, struct irdm= a_puda_send_info *info) =20 set_64bit_val(wqe, 24, hdr[1]); =20 - print_hex_dump_debug("PUDA: PUDA SEND WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, 32, false); + print_hex_dump_debug("PUDA: PUDA SEND WQE", DUMP_PREFIX_OFFSET, 16, 8, wq= e, 32, 0); irdma_uk_qp_post_wr(&qp->qp_uk); return 0; } @@ -593,8 +591,8 @@ static void irdma_puda_qp_setctx(struct irdma_puda_rsrc= *rsrc) FIELD_PREP(IRDMAQPC_RQTPHVAL, qp->rq_tph_val) | FIELD_PREP(IRDMAQPC_QSHANDLE, qp->qs_handle)); =20 - print_hex_dump_debug("PUDA: PUDA QP CONTEXT", DUMP_PREFIX_OFFSET, 16, - 8, qp_ctx, IRDMA_QP_CTX_SIZE, false); + print_hex_dump_debug("PUDA: PUDA QP CONTEXT", DUMP_PREFIX_OFFSET, 16, 8, = qp_ctx, + IRDMA_QP_CTX_SIZE, 0); } =20 /** @@ -628,8 +626,7 @@ static int irdma_puda_qp_wqe(struct irdma_sc_dev *dev, = struct irdma_sc_qp *qp) =20 set_64bit_val(wqe, 24, hdr); =20 - print_hex_dump_debug("PUDA: PUDA QP CREATE", DUMP_PREFIX_OFFSET, 16, - 8, wqe, 40, false); + print_hex_dump_debug("PUDA: PUDA QP CREATE", DUMP_PREFIX_OFFSET, 16, 8, w= qe, 40, 0); irdma_sc_cqp_post_sq(cqp); status =3D irdma_sc_poll_for_cqp_op_done(dev->cqp, IRDMA_CQP_OP_CREATE_QP, &compl_info); @@ -753,8 +750,8 @@ static int irdma_puda_cq_wqe(struct irdma_sc_dev *dev, = struct irdma_sc_cq *cq) =20 set_64bit_val(wqe, 24, hdr); =20 - print_hex_dump_debug("PUDA: PUDA CREATE CQ", DUMP_PREFIX_OFFSET, 16, - 8, wqe, IRDMA_CQP_WQE_SIZE * 8, false); + print_hex_dump_debug("PUDA: PUDA CREATE CQ", DUMP_PREFIX_OFFSET, 16, 8, w= qe, + IRDMA_CQP_WQE_SIZE * 8, 0); irdma_sc_cqp_post_sq(dev->cqp); status =3D irdma_sc_poll_for_cqp_op_done(dev->cqp, IRDMA_CQP_OP_CREATE_CQ, &compl_info); @@ -1405,7 +1402,7 @@ static int irdma_ieq_handle_partial(struct irdma_puda= _rsrc *ieq, } =20 print_hex_dump_debug("IEQ: IEQ TX BUFFER", DUMP_PREFIX_OFFSET, 16, 8, - txbuf->mem.va, txbuf->totallen, false); + txbuf->mem.va, txbuf->totallen, 0); if (ieq->dev->hw_attrs.uk_attrs.hw_rev >=3D IRDMA_GEN_2) txbuf->ah_id =3D pfpdu->ah->ah_info.ah_idx; txbuf->do_lpb =3D true; @@ -1503,8 +1500,7 @@ static int irdma_ieq_process_buf(struct irdma_puda_rs= rc *ieq, } irdma_ieq_update_tcpip_info(txbuf, len, buf->seqnum); print_hex_dump_debug("IEQ: IEQ TX BUFFER", DUMP_PREFIX_OFFSET, - 16, 8, txbuf->mem.va, txbuf->totallen, - false); + 16, 8, txbuf->mem.va, txbuf->totallen, 0); txbuf->do_lpb =3D true; irdma_puda_send_buf(ieq, txbuf); =20 @@ -1603,7 +1599,7 @@ static void irdma_ieq_handle_exception(struct irdma_p= uda_rsrc *ieq, u8 hw_rev =3D qp->dev->hw_attrs.uk_attrs.hw_rev; =20 print_hex_dump_debug("IEQ: IEQ RX BUFFER", DUMP_PREFIX_OFFSET, 16, 8, - buf->mem.va, buf->totallen, false); + buf->mem.va, buf->totallen, 0); =20 spin_lock_irqsave(&pfpdu->lock, flags); pfpdu->total_ieq_bufs++; @@ -1620,7 +1616,7 @@ static void irdma_ieq_handle_exception(struct irdma_p= uda_rsrc *ieq, =20 if (!pfpdu->mode) { print_hex_dump_debug("IEQ: Q2 BUFFER", DUMP_PREFIX_OFFSET, 16, - 8, (u64 *)qp->q2_buf, 128, false); + 8, (u64 *)qp->q2_buf, 128, 0); /* First_Partial_Sequence_Number check */ pfpdu->rcv_nxt =3D fps; pfpdu->fps =3D fps; diff --git a/drivers/infiniband/hw/irdma/uda.c b/drivers/infiniband/hw/irdm= a/uda.c index 84051266d948cb8b603549b333f40cb4705f1c77..66bb75f619f321274a55bf9484c= 564d4d719e1d9 100644 --- a/drivers/infiniband/hw/irdma/uda.c +++ b/drivers/infiniband/hw/irdma/uda.c @@ -74,7 +74,7 @@ int irdma_sc_access_ah(struct irdma_sc_cqp *cqp, struct i= rdma_ah_info *info, FIELD_PREP(IRDMA_UDA_CQPSQ_MAV_INSERTVLANTAG, info->insert_vlan_tag)); =20 print_hex_dump_debug("WQE: MANAGE_AH WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); irdma_sc_cqp_post_sq(cqp); =20 return 0; @@ -161,10 +161,10 @@ int irdma_access_mcast_grp(struct irdma_sc_cqp *cqp, FIELD_PREP(IRDMA_UDA_CQPSQ_MG_IPV4VALID, info->ipv4_valid)); =20 print_hex_dump_debug("WQE: MANAGE_MCG WQE", DUMP_PREFIX_OFFSET, 16, 8, - wqe, IRDMA_CQP_WQE_SIZE * 8, false); + wqe, IRDMA_CQP_WQE_SIZE * 8, 0); print_hex_dump_debug("WQE: MCG_HOST CTX WQE", DUMP_PREFIX_OFFSET, 16, 8, info->dma_mem_mc.va, - IRDMA_MAX_MGS_PER_CTX * 8, false); + IRDMA_MAX_MGS_PER_CTX * 8, 0); irdma_sc_cqp_post_sq(cqp); =20 return 0; diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/c= q.c index 4c54dc57806901dcebcdb1c985099734115f126c..52df66816a8d53cb2d748ec1076= da411e4bf0345 100644 --- a/drivers/infiniband/hw/mlx5/cq.c +++ b/drivers/infiniband/hw/mlx5/cq.c @@ -276,7 +276,7 @@ static void dump_cqe(struct mlx5_ib_dev *dev, struct ml= x5_err_cqe *cqe, mlx5_ib_log(level, dev, "WC error: %d, Message: %s\n", wc->status, ib_wc_status_msg(wc->status)); print_hex_dump(level, "cqe_dump: ", DUMP_PREFIX_OFFSET, 16, 1, - cqe, sizeof(*cqe), false); + cqe, sizeof(*cqe), 0); } =20 static void mlx5_handle_error_cqe(struct mlx5_ib_dev *dev, diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/s= rp/ib_srp.c index 2916e77f589b813c6f9f0608f4081c719463cfe0..b99352963f1bcc112e7e9d5ce6b= fbe412f0e7cd5 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -2079,7 +2079,7 @@ static void srp_recv_done(struct ib_cq *cq, struct ib= _wc *wc) shost_printk(KERN_ERR, target->scsi_host, PFX "recv completion, opcode 0x%02x\n", opcode); print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 8, 1, - iu->buf, wc->byte_len, true); + iu->buf, wc->byte_len, DUMP_FLAG_ASCII); } =20 switch (opcode) { diff --git a/drivers/input/touchscreen/melfas_mip4.c b/drivers/input/touchs= creen/melfas_mip4.c index a6946e3d8376d7e9b4c26f4194409e0ba78bb075..3688206dc99fd2a37c52cd0c498= 5b4e77475a3fb 100644 --- a/drivers/input/touchscreen/melfas_mip4.c +++ b/drivers/input/touchscreen/melfas_mip4.c @@ -1054,15 +1054,12 @@ static int mip4_bl_verify_page(struct mip4_ts *ts, = int offset, "Failed to validate chunk at %#04x (size %d)\n", buf_offset, MIP4_BL_PACKET_SIZE); #if MIP4_FW_UPDATE_DEBUG - print_hex_dump(KERN_DEBUG, - MIP4_DEVICE_NAME " F/W File: ", - DUMP_PREFIX_OFFSET, 16, 1, - data + offset, MIP4_BL_PACKET_SIZE, - false); - print_hex_dump(KERN_DEBUG, - MIP4_DEVICE_NAME " F/W Chip: ", - DUMP_PREFIX_OFFSET, 16, 1, - read_buf, MIP4_BL_PAGE_SIZE, false); + print_hex_dump(KERN_DEBUG, MIP4_DEVICE_NAME " F/W File: ", + DUMP_PREFIX_OFFSET, 16, 1, data + offset, + MIP4_BL_PACKET_SIZE, 0); + print_hex_dump(KERN_DEBUG, MIP4_DEVICE_NAME " F/W Chip: ", + DUMP_PREFIX_OFFSET, 16, 1, read_buf, + MIP4_BL_PAGE_SIZE, 0); #endif error =3D -EINVAL; break; @@ -1171,7 +1168,7 @@ static int mip4_parse_firmware(struct mip4_ts *ts, co= nst struct firmware *fw, =20 #if MIP4_FW_UPDATE_DEBUG print_hex_dump(KERN_ERR, MIP4_DEVICE_NAME " Bin Info: ", - DUMP_PREFIX_OFFSET, 16, 1, *fw_info, tail_size, false); + DUMP_PREFIX_OFFSET, 16, 1, *fw_info, tail_size, 0); #endif =20 tail_size =3D get_unaligned_le16(&fw_info->tail_size); diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c b/drivers/iom= mu/arm/arm-smmu-v3/arm-smmu-v3-test.c index 84baa021370a86efb5f7b3e496b1be02e8ddcb2c..1b60b23755aa797402d49c113ed= bf3e5c3328511 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c @@ -63,10 +63,8 @@ arm_smmu_test_writer_record_syncs(struct arm_smmu_entry_= writer *writer) KUNIT_ASSERT_NOT_NULL(test_writer->test, entry_used_bits); =20 pr_debug("STE value is now set to: "); - print_hex_dump_debug(" ", DUMP_PREFIX_NONE, 16, 8, - test_writer->entry, - NUM_ENTRY_QWORDS * sizeof(*test_writer->entry), - false); + print_hex_dump_debug(" ", DUMP_PREFIX_NONE, 16, 8, test_writer->entry, + NUM_ENTRY_QWORDS * sizeof(*test_writer->entry), 0); =20 test_writer->num_syncs +=3D 1; if (!test_writer->entry[0]) { @@ -99,8 +97,7 @@ arm_smmu_v3_test_debug_print_used_bits(struct arm_smmu_en= try_writer *writer, =20 arm_smmu_get_ste_used(ste, used_bits); pr_debug("STE used bits: "); - print_hex_dump_debug(" ", DUMP_PREFIX_NONE, 16, 8, used_bits, - sizeof(used_bits), false); + print_hex_dump_debug(" ", DUMP_PREFIX_NONE, 16, 8, used_bits, sizeof(u= sed_bits), 0); } =20 static const struct arm_smmu_entry_writer_ops test_ste_ops =3D { @@ -133,12 +130,10 @@ static void arm_smmu_v3_test_ste_expect_transition( }; =20 pr_debug("STE initial value: "); - print_hex_dump_debug(" ", DUMP_PREFIX_NONE, 16, 8, cur_copy.data, - sizeof(cur_copy), false); + print_hex_dump_debug(" ", DUMP_PREFIX_NONE, 16, 8, cur_copy.data, size= of(cur_copy), 0); arm_smmu_v3_test_debug_print_used_bits(&test_writer.writer, cur->data); pr_debug("STE target value: "); - print_hex_dump_debug(" ", DUMP_PREFIX_NONE, 16, 8, target->data, - sizeof(cur_copy), false); + print_hex_dump_debug(" ", DUMP_PREFIX_NONE, 16, 8, target->data, sizeo= f(cur_copy), 0); arm_smmu_v3_test_debug_print_used_bits(&test_writer.writer, target->data); =20 @@ -417,12 +412,10 @@ static void arm_smmu_v3_test_cd_expect_transition( }; =20 pr_debug("CD initial value: "); - print_hex_dump_debug(" ", DUMP_PREFIX_NONE, 16, 8, cur_copy.data, - sizeof(cur_copy), false); + print_hex_dump_debug(" ", DUMP_PREFIX_NONE, 16, 8, cur_copy.data, size= of(cur_copy), 0); arm_smmu_v3_test_debug_print_used_bits(&test_writer.writer, cur->data); pr_debug("CD target value: "); - print_hex_dump_debug(" ", DUMP_PREFIX_NONE, 16, 8, target->data, - sizeof(cur_copy), false); + print_hex_dump_debug(" ", DUMP_PREFIX_NONE, 16, 8, target->data, sizeo= f(cur_copy), 0); arm_smmu_v3_test_debug_print_used_bits(&test_writer.writer, target->data); =20 diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c index f8dd1e8315306fbd5ddcf2387b0f57976b29f04d..63bfa08f6f77895f2ff2fc5b6d5= 9209d94092cfc 100644 --- a/drivers/macintosh/via-cuda.c +++ b/drivers/macintosh/via-cuda.c @@ -762,7 +762,7 @@ cuda_input(unsigned char *buf, int nb) =20 default: print_hex_dump(KERN_INFO, "cuda_input: ", DUMP_PREFIX_NONE, 32, 1, - buf, nb, false); + buf, nb, 0); } } =20 diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windf= arm_smu_sat.c index ff8805ecf2e56e32715185ea9f08b277c8f12c50..e293b8987ef9a2451ce4bdba0c7= 1a99316ac25f2 100644 --- a/drivers/macintosh/windfarm_smu_sat.c +++ b/drivers/macintosh/windfarm_smu_sat.c @@ -100,7 +100,7 @@ struct smu_sdbp_header *smu_sat_get_sdb_partition(unsig= ned int sat_id, int id, =20 printk(KERN_DEBUG "sat %d partition %x:", sat_id, id); print_hex_dump(KERN_DEBUG, " ", DUMP_PREFIX_OFFSET, - 16, 1, buf, len, false); + 16, 1, buf, len, 0); if (size) *size =3D len; return (struct smu_sdbp_header *) buf; @@ -126,7 +126,7 @@ static int wf_sat_read_cache(struct wf_sat *sat) int i; printk(KERN_DEBUG "wf_sat_get: data is"); print_hex_dump(KERN_DEBUG, " ", DUMP_PREFIX_OFFSET, - 16, 1, sat->cache, 16, false); + 16, 1, sat->cache, 16, 0); } #endif return 0; diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c index 6ef8338add0d61bd0e746aaf0a37392fa462782d..c57accd84bc7a4b8a569ff67186= 77a624921ce87 100644 --- a/drivers/mailbox/imx-mailbox.c +++ b/drivers/mailbox/imx-mailbox.c @@ -400,7 +400,7 @@ static int imx_mu_seco_tx(struct imx_mu_priv *priv, str= uct imx_mu_con_priv *cp, } =20 print_hex_dump_debug("from client ", DUMP_PREFIX_OFFSET, 4, 4, - data, byte_size, false); + data, byte_size, 0); =20 /* Send first word */ dev_dbg(priv->dev, "Sending header\n"); @@ -478,7 +478,7 @@ static int imx_mu_seco_rxdb(struct imx_mu_priv *priv, s= truct imx_mu_con_priv *cp priv->dcfg->xSR[IMX_MU_GSR]); =20 print_hex_dump_debug("to client ", DUMP_PREFIX_OFFSET, 4, 4, - &msg, byte_size, false); + &msg, byte_size, 0); =20 /* send data to client */ dev_dbg(priv->dev, "Sending message to client\n"); diff --git a/drivers/media/common/tveeprom.c b/drivers/media/common/tveepro= m.c index b5b9d6de6d9e16e543ea0ee3df453fcfcbc149a6..f90ee1664dd8fbead0c870a52f4= f82eeb28be3f3 100644 --- a/drivers/media/common/tveeprom.c +++ b/drivers/media/common/tveeprom.c @@ -753,7 +753,7 @@ int tveeprom_read(struct i2c_client *c, unsigned char *= eedata, int len) } =20 print_hex_dump_debug("full 256-byte eeprom dump:", DUMP_PREFIX_NONE, - 16, 1, eedata, len, true); + 16, 1, eedata, len, DUMP_FLAG_ASCII); return 0; } EXPORT_SYMBOL(tveeprom_read); diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_= net.c index 8bb8dd34c223e91119059965851de57cac9af8e5..f49c4ad9c00b6bc66f1ce261553= a905436d8b977 100644 --- a/drivers/media/dvb-core/dvb_net.c +++ b/drivers/media/dvb-core/dvb_net.c @@ -78,7 +78,7 @@ static unsigned char *ule_where =3D ule_hist, ule_dump; =20 static void hexdump(const unsigned char *buf, unsigned short len) { - print_hex_dump_debug("", DUMP_PREFIX_OFFSET, 16, 1, buf, len, true); + print_hex_dump_debug("", DUMP_PREFIX_OFFSET, 16, 1, buf, len, DUMP_FLAG_A= SCII); } #endif =20 diff --git a/drivers/media/firewire/firedtv-avc.c b/drivers/media/firewire/= firedtv-avc.c index a36c284121702830cb88c0a1d508ac23e79c6c8f..7ef7e103447acc932a76d682a58= 025ffd0d5ca58 100644 --- a/drivers/media/firewire/firedtv-avc.c +++ b/drivers/media/firewire/firedtv-avc.c @@ -216,7 +216,7 @@ static void debug_fcp(const u8 *data, int length) debug_fcp_ctype(data[0]), op); if (avc_debug & AVC_DEBUG_FCP_PAYLOADS) print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_NONE, - 16, 1, data, length, false); + 16, 1, data, length, 0); } } =20 @@ -224,7 +224,7 @@ static void debug_pmt(char *msg, int length) { printk(KERN_INFO "APP PMT -> l=3D%d\n", length); print_hex_dump(KERN_INFO, "APP PMT -> ", DUMP_PREFIX_NONE, - 16, 1, msg, length, false); + 16, 1, msg, length, 0); } =20 static int avc_write(struct firedtv *fdtv) diff --git a/drivers/media/pci/saa7164/saa7164-api.c b/drivers/media/pci/sa= a7164/saa7164-api.c index 965d285a9240a9e8e0a46630b40105bc7154464a..e40859d46812a380c2ee56625cc= 8a4be1193a613 100644 --- a/drivers/media/pci/saa7164/saa7164-api.c +++ b/drivers/media/pci/saa7164/saa7164-api.c @@ -1339,7 +1339,7 @@ int saa7164_api_enum_subdevs(struct saa7164_dev *dev) =20 if (saa_debug & DBGLVL_API) print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, buf, - buflen & ~15, false); + buflen & ~15, 0); =20 saa7164_api_dump_subdevs(dev, buf, buflen); =20 @@ -1392,7 +1392,7 @@ int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 = addr, u32 reglen, u8 *reg, =20 if (saa_debug & DBGLVL_I2C) print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, buf, - 32, false); + 32, 0); =20 ret =3D saa7164_cmd_send(bus->dev, unitid, GET_CUR, EXU_REGISTER_ACCESS_CONTROL, len, &buf); @@ -1401,7 +1401,7 @@ int saa7164_api_i2c_read(struct saa7164_i2c *bus, u8 = addr, u32 reglen, u8 *reg, else { if (saa_debug & DBGLVL_I2C) print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, - buf, sizeof(buf), false); + buf, sizeof(buf), 0); memcpy(data, (buf + 2 * sizeof(u32) + reglen), datalen); } =20 @@ -1464,7 +1464,7 @@ int saa7164_api_i2c_write(struct saa7164_i2c *bus, u8= addr, u32 datalen, =20 if (saa_debug & DBGLVL_I2C) print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, - buf, sizeof(buf), false); + buf, sizeof(buf), 0); =20 ret =3D saa7164_cmd_send(bus->dev, unitid, SET_CUR, EXU_REGISTER_ACCESS_CONTROL, len, &buf); diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/s= aa7164/saa7164-core.c index a8a004f28ca0e227764dfc60fe99d85e33a6dc60..59aafe7006b3a2374412d7da104= 13966490567c5 100644 --- a/drivers/media/pci/saa7164/saa7164-core.c +++ b/drivers/media/pci/saa7164/saa7164-core.c @@ -93,7 +93,7 @@ static void saa7164_pack_verifier(struct saa7164_buffer *= buf) printk(KERN_ERR "No pack at 0x%x\n", i); #if 0 print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, - p + 1, 32, false); + p + 1, 32, 0); #endif } } @@ -285,7 +285,7 @@ static void saa7164_work_enchandler_helper(struct saa71= 64_port *port, int bufnr) __func__, buf); #if 0 print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, - p + buf->actual_size - 32, 64, false); + p + buf->actual_size - 32, 64, 0); #endif } } diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media= /platform/nxp/imx-jpeg/mxc-jpeg.c index 7f5fe551179b9eb27a3e6846f57d083dd5323ffc..077aaa38fc858ff073858befc94= 363722682d27c 100644 --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c @@ -608,7 +608,7 @@ static void print_mxc_buf(struct mxc_jpeg_dev *jpeg, st= ruct vb2_buffer *buf, "plane %d (vaddr=3D%p dma_addr=3D%x payload=3D%ld):", plane_no, vaddr, dma_addr, payload); print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, - vaddr, len, false); + vaddr, len, 0); } } =20 diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/= platform/qcom/venus/hfi_venus.c index f9437b6412b91c2483670a2b11f4fd43f3206404..6ec7a08046898c7a0e5c4a5a002= c3beca5db4ca6 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -156,7 +156,7 @@ static void venus_dump_packet(struct venus_hfi_device *= hdev, const void *packet) return; =20 print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1, packet, - pkt_size, true); + pkt_size, DUMP_FLAG_ASCII); } =20 static int venus_write_queue(struct venus_hfi_device *hdev, diff --git a/drivers/media/platform/ti/cal/cal.c b/drivers/media/platform/t= i/cal/cal.c index 4bd2092e0255f701010bb82e8dbc1fed26121108..65e7efb8223959d06a82edabde5= 8d51439d0631f 100644 --- a/drivers/media/platform/ti/cal/cal.c +++ b/drivers/media/platform/ti/cal/cal.c @@ -247,7 +247,7 @@ void cal_quickdump_regs(struct cal_dev *cal) cal_info(cal, "CAL Registers @ 0x%pa:\n", &cal->res->start); print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 4, (__force const void *)cal->base, - resource_size(cal->res), false); + resource_size(cal->res), 0); =20 for (i =3D 0; i < cal->data->num_csi2_phy; ++i) { struct cal_camerarx *phy =3D cal->phy[i]; @@ -256,8 +256,7 @@ void cal_quickdump_regs(struct cal_dev *cal) &phy->res->start); print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 4, (__force const void *)phy->base, - resource_size(phy->res), - false); + resource_size(phy->res), 0); } } =20 diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28= xx/em28xx-i2c.c index a7eb11f7fb349114172cba5e02d1553ecbede2b2..e0468113efdaab4d0c5d623009e= 2d5411944028d 100644 --- a/drivers/media/usb/em28xx/em28xx-i2c.c +++ b/drivers/media/usb/em28xx/em28xx-i2c.c @@ -711,7 +711,7 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsign= ed int bus, if (i2c_debug) { /* Display eeprom content */ print_hex_dump(KERN_DEBUG, "em28xx eeprom ", DUMP_PREFIX_OFFSET, - 16, 1, data, len, true); + 16, 1, data, len, DUMP_FLAG_ASCII); =20 if (dev->eeprom_addrwidth_16bit) dev_info(&dev->intf->dev, diff --git a/drivers/mfd/rave-sp.c b/drivers/mfd/rave-sp.c index c1b78d127a261e88ab0bfaa50716560c47f8d285..056a11fb4e3d3de0df76052dd68= 545c4fb14528a 100644 --- a/drivers/mfd/rave-sp.c +++ b/drivers/mfd/rave-sp.c @@ -303,7 +303,7 @@ static int rave_sp_write(struct rave_sp *sp, const u8 *= data, u8 data_size) length =3D dest - frame; =20 print_hex_dump_debug("rave-sp tx: ", DUMP_PREFIX_NONE, - 16, 1, frame, length, false); + 16, 1, frame, length, 0); =20 return serdev_device_write(sp->serdev, frame, length, HZ); } @@ -450,7 +450,7 @@ static void rave_sp_receive_frame(struct rave_sp *sp, } =20 print_hex_dump_debug("rave-sp rx: ", DUMP_PREFIX_NONE, - 16, 1, data, length, false); + 16, 1, data, length, 0); =20 if (unlikely(length <=3D checksum_length)) { dev_warn(dev, "Dropping short frame\n"); diff --git a/drivers/misc/genwqe/genwqe_driver.h b/drivers/misc/genwqe/genw= qe_driver.h index 8c333481b3ba53fbb4afc8f44c908dab12846759..c3fee55770b82ab564fd53b2fda= c1f169962dd1e 100644 --- a/drivers/misc/genwqe/genwqe_driver.h +++ b/drivers/misc/genwqe/genwqe_driver.h @@ -63,7 +63,7 @@ static inline void genwqe_hexdump(struct pci_dev *pci_dev, GENWQE_DEVNAME, pci_name(pci_dev)); =20 print_hex_dump_debug(prefix, DUMP_PREFIX_OFFSET, 16, 1, buff, - size, true); + size, DUMP_FLAG_ASCII); } =20 #endif /* __GENWQE_DRIVER_H__ */ diff --git a/drivers/mtd/tests/mtd_nandecctest.c b/drivers/mtd/tests/mtd_na= ndecctest.c index 824cc1c03b6a335f27f5ac7cfc593e4976cfd076..273b49abcf28dd08b1239c2a80a= afc627bec6cd5 100644 --- a/drivers/mtd/tests/mtd_nandecctest.c +++ b/drivers/mtd/tests/mtd_nandecctest.c @@ -235,15 +235,15 @@ static void dump_data_ecc(void *error_data, void *err= or_ecc, void *correct_data, { pr_info("hexdump of error data:\n"); print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 4, - error_data, size, false); + error_data, size, 0); print_hex_dump(KERN_INFO, "hexdump of error ecc: ", - DUMP_PREFIX_NONE, 16, 1, error_ecc, 3, false); + DUMP_PREFIX_NONE, 16, 1, error_ecc, 3, 0); =20 pr_info("hexdump of correct data:\n"); print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 4, - correct_data, size, false); + correct_data, size, 0); print_hex_dump(KERN_INFO, "hexdump of correct ecc: ", - DUMP_PREFIX_NONE, 16, 1, correct_ecc, 3, false); + DUMP_PREFIX_NONE, 16, 1, correct_ecc, 3, 0); } =20 static int nand_ecc_test_run(const size_t size) diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c index d2a53961d8e207d9a105934b8a4c1b440374bb71..bba851b1be9b88274293eed6c36= c733fad042bc2 100644 --- a/drivers/mtd/ubi/debug.c +++ b/drivers/mtd/ubi/debug.c @@ -68,7 +68,7 @@ void ubi_dump_flash(struct ubi_device *ubi, int pnum, int= offset, int len) =20 ubi_msg(ubi, "dumping %d bytes of data from PEB %d, offset %d", len, pnum, offset); - print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, buf, len, 1); + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, buf, len, DUMP_= FLAG_ASCII); out: vfree(buf); return; @@ -90,7 +90,7 @@ void ubi_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr) pr_err("\thdr_crc %#08x\n", be32_to_cpu(ec_hdr->hdr_crc)); pr_err("erase counter header hexdump:\n"); print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, - ec_hdr, UBI_EC_HDR_SIZE, 1); + ec_hdr, UBI_EC_HDR_SIZE, DUMP_FLAG_ASCII); } =20 /** @@ -115,7 +115,7 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr) pr_err("\thdr_crc %08x\n", be32_to_cpu(vid_hdr->hdr_crc)); pr_err("Volume identifier header hexdump:\n"); print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, - vid_hdr, UBI_VID_HDR_SIZE, 1); + vid_hdr, UBI_VID_HDR_SIZE, DUMP_FLAG_ASCII); } =20 /** diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h index b2fd9754880843750e5b0612868915b10038fce2..670ee98677e15a5abf70bac38b7= 4dbbdddcea984 100644 --- a/drivers/mtd/ubi/debug.h +++ b/drivers/mtd/ubi/debug.h @@ -23,7 +23,7 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr); } while (0) =20 #define ubi_dbg_print_hex_dump(l, ps, pt, r, g, b, len, a) = \ - print_hex_dump(l, ps, pt, r, g, b, len, a) + print_hex_dump(l, ps, pt, r, g, b, len, a ? DUMP_FLAG_ASCII : 0) =20 #define ubi_dbg_msg(type, fmt, ...) \ pr_debug("UBI DBG " type " (pid %d): " fmt "\n", current->pid, \ diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c index a4999bce435f5618986dc9b96f973cf4e64676c0..7da27e0c274c2b2f8f34c3606ee= b77ff14293519 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c @@ -1400,11 +1400,11 @@ static int self_check_write(struct ubi_device *ubi,= const void *buf, int pnum, ubi_msg(ubi, "hex dump of the original buffer from %d to %d", i, i + dump_len); print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, - buf + i, dump_len, 1); + buf + i, dump_len, DUMP_FLAG_ASCII); ubi_msg(ubi, "hex dump of the read buffer from %d to %d", i, i + dump_len); print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, - buf1 + i, dump_len, 1); + buf1 + i, dump_len, DUMP_FLAG_ASCII); dump_stack(); err =3D -EINVAL; goto out_free; @@ -1465,7 +1465,7 @@ int ubi_self_check_all_ff(struct ubi_device *ubi, int= pnum, int offset, int len) fail: ubi_err(ubi, "self-check failed for PEB %d", pnum); ubi_msg(ubi, "hex dump of the %d-%d region", offset, offset + len); - print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, buf, len, 1); + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 1, buf, len, DUMP_= FLAG_ASCII); err =3D -EINVAL; error: dump_stack(); diff --git a/drivers/net/arcnet/arcnet.c b/drivers/net/arcnet/arcnet.c index 530c15d6a5eb8d8f5583acc806d6887a1b2ce2e0..d5a3608ad3e28abd23995049ec3= c5646d15139a0 100644 --- a/drivers/net/arcnet/arcnet.c +++ b/drivers/net/arcnet/arcnet.c @@ -153,7 +153,7 @@ void arcnet_dump_skb(struct net_device *dev, /* dump the packet */ snprintf(hdr, sizeof(hdr), "%6s:%s skb->data:", dev->name, desc); print_hex_dump(KERN_DEBUG, hdr, DUMP_PREFIX_OFFSET, - 16, 1, skb->data, skb->len, true); + 16, 1, skb->data, skb->len, DUMP_FLAG_ASCII); } EXPORT_SYMBOL(arcnet_dump_skb); #endif @@ -185,7 +185,7 @@ static void arcnet_dump_packet(struct net_device *dev, = int bufnum, /* dump the packet */ snprintf(hdr, sizeof(hdr), "%6s:%s packet dump:", dev->name, desc); print_hex_dump(KERN_DEBUG, hdr, DUMP_PREFIX_OFFSET, - 16, 1, buf, length, true); + 16, 1, buf, length, DUMP_FLAG_ASCII); } =20 #else diff --git a/drivers/net/can/usb/etas_es58x/es58x_core.c b/drivers/net/can/= usb/etas_es58x/es58x_core.c index 71f24dc0a927118af04ab345aae5ee3da5a3d34d..fb507f5c475e0887becfc4becaa= 754ea430d59e3 100644 --- a/drivers/net/can/usb/etas_es58x/es58x_core.c +++ b/drivers/net/can/usb/etas_es58x/es58x_core.c @@ -59,11 +59,11 @@ MODULE_DEVICE_TABLE(usb, es58x_id_table); #define es58x_print_hex_dump(buf, len) \ print_hex_dump(KERN_DEBUG, \ KBUILD_MODNAME " " __stringify(buf) ": ", \ - DUMP_PREFIX_NONE, 16, 1, buf, len, false) + DUMP_PREFIX_NONE, 16, 1, buf, len, 0) =20 #define es58x_print_hex_dump_debug(buf, len) \ print_hex_dump_debug(KBUILD_MODNAME " " __stringify(buf) ": ",\ - DUMP_PREFIX_NONE, 16, 1, buf, len, false) + DUMP_PREFIX_NONE, 16, 1, buf, len, 0) =20 /* The last two bytes of an ES58X command is a CRC16. The first two * bytes (the start of frame) are skipped and the CRC calculation diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can= /usb/peak_usb/pcan_usb_core.c index 59f7cd8ceb397ff1a0cb283816689a95a9ca3dfd..b4a690a2e277e80b26203fa26dc= 0d9534385a830 100644 --- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c +++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c @@ -84,7 +84,7 @@ void pcan_dump_mem(const char *prompt, const void *p, int= l) pr_info("%s dumping %s (%d bytes):\n", PCAN_USB_DRIVER_NAME, prompt ? prompt : "memory", l); print_hex_dump(KERN_INFO, PCAN_USB_DRIVER_NAME " ", DUMP_PREFIX_NONE, - DUMP_WIDTH, 1, p, l, false); + DUMP_WIDTH, 1, p, l, 0); } =20 /* diff --git a/drivers/net/can/usb/ucan.c b/drivers/net/can/usb/ucan.c index 39a63b7313a46d3d1d5bacb4943fb17f611c231f..2911b08bac578b5ba8b43661283= 8edcba01b1551 100644 --- a/drivers/net/can/usb/ucan.c +++ b/drivers/net/can/usb/ucan.c @@ -751,14 +751,8 @@ static void ucan_read_bulk_callback(struct urb *urb) netdev_warn(up->netdev, "invalid message (short; no data; l:%d)\n", urb->actual_length); - print_hex_dump(KERN_WARNING, - "raw data: ", - DUMP_PREFIX_ADDRESS, - 16, - 1, - urb->transfer_buffer, - urb->actual_length, - true); + print_hex_dump(KERN_WARNING, "raw data: ", DUMP_PREFIX_ADDRESS, 16, 1, + urb->transfer_buffer, urb->actual_length, DUMP_FLAG_ASCII); =20 goto resubmit; } diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/a= eroflex/greth.c index a593adc16c78ab5f459a54adce928f4102c42167..abc4d5e4c8397e6625e26a26878= 550f7c39819d5 100644 --- a/drivers/net/ethernet/aeroflex/greth.c +++ b/drivers/net/ethernet/aeroflex/greth.c @@ -89,8 +89,7 @@ static void greth_set_multicast_list(struct net_device *d= ev); =20 static void greth_print_rx_packet(void *addr, int len) { - print_hex_dump(KERN_DEBUG, "RX: ", DUMP_PREFIX_OFFSET, 16, 1, - addr, len, true); + print_hex_dump(KERN_DEBUG, "RX: ", DUMP_PREFIX_OFFSET, 16, 1, addr, len, = DUMP_FLAG_ASCII); } =20 static void greth_print_tx_packet(struct sk_buff *skb) @@ -104,13 +103,13 @@ static void greth_print_tx_packet(struct sk_buff *skb) length =3D skb_headlen(skb); =20 print_hex_dump(KERN_DEBUG, "TX: ", DUMP_PREFIX_OFFSET, 16, 1, - skb->data, length, true); + skb->data, length, DUMP_FLAG_ASCII); =20 for (i =3D 0; i < skb_shinfo(skb)->nr_frags; i++) { =20 print_hex_dump(KERN_DEBUG, "TX: ", DUMP_PREFIX_OFFSET, 16, 1, skb_frag_address(&skb_shinfo(skb)->frags[i]), - skb_frag_size(&skb_shinfo(skb)->frags[i]), true); + skb_frag_size(&skb_shinfo(skb)->frags[i]), DUMP_FLAG_ASCII); } } =20 diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/et= hernet/altera/altera_tse_main.c index 3f6204de9e6b802ad6f0b702a0947d2dbcd5518a..82fbc983a4f5a07d0555ffa215c= 84fe0670d0721 100644 --- a/drivers/net/ethernet/altera/altera_tse_main.c +++ b/drivers/net/ethernet/altera/altera_tse_main.c @@ -403,7 +403,7 @@ static int tse_rx(struct altera_tse_private *priv, int = limit) netdev_info(priv->dev, "frame received %d bytes\n", pktlength); print_hex_dump(KERN_ERR, "data: ", DUMP_PREFIX_OFFSET, - 16, 1, skb->data, pktlength, true); + 16, 1, skb->data, pktlength, DUMP_FLAG_ASCII); } =20 tse_rx_vlan(priv->dev, skb); diff --git a/drivers/net/ethernet/amd/a2065.c b/drivers/net/ethernet/amd/a2= 065.c index 1ca26a8c40ebf09293c17809c5d2900941d235f9..ca522fe7cff78110a5b227e0820= 4341beb78aeff 100644 --- a/drivers/net/ethernet/amd/a2065.c +++ b/drivers/net/ethernet/amd/a2065.c @@ -549,7 +549,7 @@ static netdev_tx_t lance_start_xmit(struct sk_buff *skb, =20 /* dump the packet */ print_hex_dump_debug("skb->data: ", DUMP_PREFIX_NONE, 16, 1, skb->data, - 64, true); + 64, DUMP_FLAG_ASCII); =20 entry =3D lp->tx_new & lp->tx_ring_mod_mask; ib->btx_ring[entry].length =3D (-skblen) | 0xf000; diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/= ariadne.c index fa201da567edd7c7a011f971851bf669c0974fd8..0654f8b3527484835a8f82ef2ce= 702ba516f5f77 100644 --- a/drivers/net/ethernet/amd/ariadne.c +++ b/drivers/net/ethernet/amd/ariadne.c @@ -585,7 +585,7 @@ static netdev_tx_t ariadne_start_xmit(struct sk_buff *s= kb, #ifdef DEBUG print_hex_dump(KERN_DEBUG, "tx_buff: ", DUMP_PREFIX_OFFSET, 16, 1, (void *)priv->tx_buff[entry], - skb->len > 64 ? 64 : skb->len, true); + skb->len > 64 ? 64 : skb->len, DUMP_FLAG_ASCII); #endif =20 priv->tx_ring[entry]->TMD1 =3D (priv->tx_ring[entry]->TMD1 & 0xff00) diff --git a/drivers/net/ethernet/amd/pds_core/adminq.c b/drivers/net/ether= net/amd/pds_core/adminq.c index c83a0a80d5334efc45f21c04ff804e3820d1e8c3..0307724bf82f775bf0c51e79ba4= 51cbe0bd54294 100644 --- a/drivers/net/ethernet/amd/pds_core/adminq.c +++ b/drivers/net/ethernet/amd/pds_core/adminq.c @@ -213,7 +213,7 @@ static int __pdsc_adminq_post(struct pdsc *pdsc, q->head_idx, q->tail_idx); dev_dbg(pdsc->dev, "post admin queue command:\n"); dynamic_hex_dump("cmd ", DUMP_PREFIX_OFFSET, 16, 1, - cmd, sizeof(*cmd), true); + cmd, sizeof(*cmd), DUMP_FLAG_ASCII); =20 q->head_idx =3D (q->head_idx + 1) & (q->num_descs - 1); =20 @@ -298,7 +298,7 @@ int pdsc_adminq_post(struct pdsc *pdsc, =20 dev_dbg(pdsc->dev, "read admin queue completion idx %d:\n", index); dynamic_hex_dump("comp ", DUMP_PREFIX_OFFSET, 16, 1, - comp, sizeof(*comp), true); + comp, sizeof(*comp), DUMP_FLAG_ASCII); =20 if (remaining && comp->status) err =3D pdsc_err_to_errno(comp->status); diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/etherne= t/cadence/macb_main.c index daa416fb1724e942c74279ca632814be99ffcae1..5b4eaa64f95ebe363fe56836d01= 248f7bf5e5773 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -1466,9 +1466,9 @@ static int gem_rx(struct macb_queue *queue, struct na= pi_struct *napi, netdev_vdbg(bp->dev, "received skb of length %u, csum: %08x\n", skb->len, skb->csum); print_hex_dump(KERN_DEBUG, " mac: ", DUMP_PREFIX_ADDRESS, 16, 1, - skb_mac_header(skb), 16, true); + skb_mac_header(skb), 16, DUMP_FLAG_ASCII); print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_ADDRESS, 16, 1, - skb->data, 32, true); + skb->data, 32, DUMP_FLAG_ASCII); #endif =20 napi_gro_receive(napi, skb); @@ -2356,7 +2356,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *sk= b, struct net_device *dev) queue_index, skb->len, skb->head, skb->data, skb_tail_pointer(skb), skb_end_pointer(skb)); print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_OFFSET, 16, 1, - skb->data, 16, true); + skb->data, 16, DUMP_FLAG_ASCII); #endif =20 /* Count how many TX buffer descriptors are needed to send this diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net= /ethernet/cavium/thunder/nicvf_main.c index aebb9fef3f6eb1ff78ae5478ec670e1000a7eb63..55bc4c4019f1957056be3199e68= ea4cb029f3081 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c @@ -809,7 +809,7 @@ static void nicvf_rcv_pkt_handler(struct net_device *ne= tdev, if (netif_msg_pktdata(nic)) { netdev_info(nic->netdev, "skb 0x%p, len=3D%d\n", skb, skb->len); print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, - skb->data, skb->len, true); + skb->data, skb->len, DUMP_FLAG_ASCII); } =20 /* If error packet, drop it here */ diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/n= et/ethernet/hisilicon/hns3/hns3_ethtool.c index b771a2daba4360e7dbab04240fc280020facc5fc..24fdc24d2657731410c791ea5da= 1d9c583712531 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c @@ -200,7 +200,7 @@ static void hns3_lb_check_skb_data(struct hns3_enet_rin= g *ring, tqp_vector->rx_group.total_packets++; else print_hex_dump(KERN_ERR, "selftest:", DUMP_PREFIX_OFFSET, 16, 1, - skb->data, len, true); + skb->data, len, DUMP_FLAG_ASCII); =20 dev_kfree_skb_any(skb); } diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ether= net/intel/e1000e/netdev.c index 286155efcedf7ac0c1d12d0cb1098673ddfdf568..c5e3cee5076de1600d063b60b4b= 99a497a81012b 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -183,7 +183,7 @@ static void e1000e_dump_ps_pages(struct e1000_adapter *= adapter, pr_info("packet dump for ps_page %d:\n", i); print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS, 16, 1, page_address(ps_page->page), - PAGE_SIZE, true); + PAGE_SIZE, DUMP_FLAG_ASCII); } } } @@ -312,7 +312,7 @@ static void e1000e_dump(struct e1000_adapter *adapter) if (netif_msg_pktdata(adapter) && buffer_info->skb) print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS, 16, 1, buffer_info->skb->data, - buffer_info->skb->len, true); + buffer_info->skb->len, DUMP_FLAG_ASCII); } =20 /* Print Rx Ring Summary */ @@ -459,7 +459,7 @@ static void e1000e_dump(struct e1000_adapter *adapter) 1, buffer_info->skb->data, adapter->rx_buffer_len, - true); + DUMP_FLAG_ASCII); } } } diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/et= hernet/intel/i40e/i40e_common.c index e8031f1a9b4fc6c352ae89b339dcdabaaf50cdfc..3ff4c27f3fbcee63777559b5f07= 7a1c1e5ee0478 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_common.c +++ b/drivers/net/ethernet/intel/i40e/i40e_common.c @@ -184,7 +184,7 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_= mask mask, void *desc, hw->bus.func); =20 print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_OFFSET, - 16, 1, buf, len, false); + 16, 1, buf, len, 0); } } =20 diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/e= thernet/intel/i40e/i40e_debugfs.c index 208c2f0857b61c71de62ad0d5b034953dee986de..4757a7e06b368e2e77e5dff2aa2= 587466ee440f4 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c +++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c @@ -1165,9 +1165,8 @@ static ssize_t i40e_dbg_command_write(struct file *fi= lp, dev_info(&pf->pdev->dev, "AQ debug dump fwdata rlen=3D0x%x next_table=3D0x%x next_index=3D0x%x= \n", rlen, next_table, next_index); - print_hex_dump(KERN_INFO, "AQ buffer WB: ", - DUMP_PREFIX_OFFSET, 16, 1, - buff, rlen, true); + print_hex_dump(KERN_INFO, "AQ buffer WB: ", DUMP_PREFIX_OFFSET, 16, 1, + buff, rlen, DUMP_FLAG_ASCII); kfree(buff); buff =3D NULL; } else { @@ -1372,9 +1371,8 @@ static ssize_t i40e_dbg_command_write(struct file *fi= lp, desc->params.internal.param1, desc->params.internal.param2, desc->params.internal.param3); - print_hex_dump(KERN_INFO, "AQ buffer WB: ", - DUMP_PREFIX_OFFSET, 16, 1, - buff, buffer_len, true); + print_hex_dump(KERN_INFO, "AQ buffer WB: ", DUMP_PREFIX_OFFSET, 16, 1, + buff, buffer_len, DUMP_FLAG_ASCII); kfree(buff); buff =3D NULL; kfree(desc); @@ -1458,9 +1456,8 @@ static ssize_t i40e_dbg_command_write(struct file *fi= lp, goto command_write_done; } dev_info(&pf->pdev->dev, "LLDP MIB (local)\n"); - print_hex_dump(KERN_INFO, "LLDP MIB (local): ", - DUMP_PREFIX_OFFSET, 16, 1, - buff, I40E_LLDPDU_SIZE, true); + print_hex_dump(KERN_INFO, "LLDP MIB (local): ", DUMP_PREFIX_OFFSET, 16,= 1, + buff, I40E_LLDPDU_SIZE, DUMP_FLAG_ASCII); kfree(buff); buff =3D NULL; } else if (strncmp(&cmd_buf[5], "get remote", 10) =3D=3D 0) { @@ -1486,9 +1483,8 @@ static ssize_t i40e_dbg_command_write(struct file *fi= lp, goto command_write_done; } dev_info(&pf->pdev->dev, "LLDP MIB (remote)\n"); - print_hex_dump(KERN_INFO, "LLDP MIB (remote): ", - DUMP_PREFIX_OFFSET, 16, 1, - buff, I40E_LLDPDU_SIZE, true); + print_hex_dump(KERN_INFO, "LLDP MIB (remote): ", DUMP_PREFIX_OFFSET, 16= , 1, + buff, I40E_LLDPDU_SIZE, DUMP_FLAG_ASCII); kfree(buff); buff =3D NULL; } else if (strncmp(&cmd_buf[5], "event on", 8) =3D=3D 0) { @@ -1570,9 +1566,8 @@ static ssize_t i40e_dbg_command_write(struct file *fi= lp, "Read NVM module=3D0x%x offset=3D0x%x words=3D%d\n", module, offset, buffer_len); if (bytes) - print_hex_dump(KERN_INFO, "NVM Dump: ", - DUMP_PREFIX_OFFSET, 16, 2, - buff, bytes, true); + print_hex_dump(KERN_INFO, "NVM Dump: ", DUMP_PREFIX_OFFSET, 16, 2, + buff, bytes, DUMP_FLAG_ASCII); } kfree(buff); buff =3D NULL; diff --git a/drivers/net/ethernet/intel/iavf/iavf_common.c b/drivers/net/et= hernet/intel/iavf/iavf_common.c index aa751ce3425b4d40538f1b860e74963de9ae42ef..d2d5a82fe7df430c34486807843= 8a5b1d51cac1b 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_common.c +++ b/drivers/net/ethernet/intel/iavf/iavf_common.c @@ -267,7 +267,7 @@ void iavf_debug_aq(struct iavf_hw *hw, enum iavf_debug_= mask mask, void *desc, hw->bus.func); =20 print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_OFFSET, - 16, 1, buf, len, false); + 16, 1, buf, len, 0); } } } diff --git a/drivers/net/ethernet/intel/ice/ice_osdep.h b/drivers/net/ether= net/intel/ice/ice_osdep.h index b9f383494b3fc11154d6ffc7316cf90cca2e4d0d..78a79a86456b5c819e5efe4ec89= 65ef8d32cf563 100644 --- a/drivers/net/ethernet/intel/ice/ice_osdep.h +++ b/drivers/net/ethernet/intel/ice/ice_osdep.h @@ -45,7 +45,7 @@ struct device *ice_hw_to_dev(struct ice_hw *hw); =20 #define _ice_debug_array(hw, type, prefix, rowsize, groupsize, buf, len) \ print_hex_dump_debug(prefix, DUMP_PREFIX_OFFSET, \ - rowsize, groupsize, buf, len, false) + rowsize, groupsize, buf, len, 0) #else /* CONFIG_DYNAMIC_DEBUG */ #define ice_debug(hw, type, fmt, args...) \ do { \ @@ -59,7 +59,7 @@ do { \ if ((type) & (hw)->debug_mask) \ print_hex_dump_debug(prefix, DUMP_PREFIX_OFFSET,\ rowsize, groupsize, buf, \ - len, false); \ + len, 0); \ } while (0) #else /* DEBUG */ #define _ice_debug_array(hw, type, prefix, rowsize, groupsize, buf, len) \ diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethern= et/intel/igb/igb_main.c index 08578980b651802c191c0ec9be050810d6a93844..ab8fb57e412bc71280aaa7ef612= 63c451bd50693 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -420,11 +420,9 @@ static void igb_dump(struct igb_adapter *adapter) buffer_info->skb, next_desc); =20 if (netif_msg_pktdata(adapter) && buffer_info->skb) - print_hex_dump(KERN_INFO, "", - DUMP_PREFIX_ADDRESS, - 16, 1, buffer_info->skb->data, - dma_unmap_len(buffer_info, len), - true); + print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS, 16, 1, + buffer_info->skb->data, + dma_unmap_len(buffer_info, len), DUMP_FLAG_ASCII); } } =20 @@ -505,12 +503,10 @@ static void igb_dump(struct igb_adapter *adapter) =20 if (netif_msg_pktdata(adapter) && buffer_info->dma && buffer_info->page) { - print_hex_dump(KERN_INFO, "", - DUMP_PREFIX_ADDRESS, - 16, 1, - page_address(buffer_info->page) + - buffer_info->page_offset, - igb_rx_bufsz(rx_ring), true); + print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS, 16, 1, + page_address(buffer_info->page) + + buffer_info->page_offset, + igb_rx_bufsz(rx_ring), DUMP_FLAG_ASCII); } } } diff --git a/drivers/net/ethernet/intel/igc/igc_dump.c b/drivers/net/ethern= et/intel/igc/igc_dump.c index c09c95cc5f70e5493d239edc9e2958d3502693cf..e935866da98d8ad86b95dbada56= 4a3d4f425d4de 100644 --- a/drivers/net/ethernet/intel/igc/igc_dump.c +++ b/drivers/net/ethernet/intel/igc/igc_dump.c @@ -198,11 +198,9 @@ void igc_rings_dump(struct igc_adapter *adapter) buffer_info->skb, next_desc); =20 if (netif_msg_pktdata(adapter) && buffer_info->skb) - print_hex_dump(KERN_INFO, "", - DUMP_PREFIX_ADDRESS, - 16, 1, buffer_info->skb->data, - dma_unmap_len(buffer_info, len), - true); + print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS, 16, 1, + buffer_info->skb->data, + dma_unmap_len(buffer_info, len), DUMP_FLAG_ASCII); } } =20 @@ -292,7 +290,7 @@ void igc_rings_dump(struct igc_adapter *adapter) (buffer_info->page) + buffer_info->page_offset, igc_rx_bufsz(rx_ring), - true); + DUMP_FLAG_ASCII); } } } diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/et= hernet/intel/ixgbe/ixgbe_main.c index 2e38e8f6fac18d43f054aa1a3fac0cf3b8a0f451..80516d265e66fc35a877f0e7c3c= 63a957b0557ac 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -704,7 +704,7 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter) DUMP_PREFIX_ADDRESS, 16, 1, tx_buffer->skb->data, dma_unmap_len(tx_buffer, len), - true); + DUMP_FLAG_ASCII); } } } @@ -820,7 +820,8 @@ static void ixgbe_dump(struct ixgbe_adapter *adapter) DUMP_PREFIX_ADDRESS, 16, 1, page_address(rx_buffer_info->page) + rx_buffer_info->page_offset, - ixgbe_rx_bufsz(rx_ring), true); + ixgbe_rx_bufsz(rx_ring), + DUMP_FLAG_ASCII); } } } diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ether= net/mellanox/mlx4/en_tx.c index 1ddb11cb25f9162cc1eaf73601038c1cf13f347f..1038c3efcceefaab3ef5c16b3d1= ee66c3d629257 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c @@ -408,8 +408,7 @@ static void mlx4_en_handle_err_cqe(struct mlx4_en_priv = *priv, struct mlx4_err_cq =20 en_err(priv, "CQE error - cqn 0x%x, ci 0x%x, vendor syndrome: 0x%x syndro= me: 0x%x\n", ring->sp_cqn, cqe_index, err_cqe->vendor_err_syndrome, err_cqe->sy= ndrome); - print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, 16, 1, err_cqe, size= of(*err_cqe), - false); + print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, 16, 1, err_cqe, size= of(*err_cqe), 0); =20 wqe_index =3D be16_to_cpu(err_cqe->wqe_index) & ring->size_mask; tx_info =3D &ring->tx_info[wqe_index]; @@ -417,7 +416,7 @@ static void mlx4_en_handle_err_cqe(struct mlx4_en_priv = *priv, struct mlx4_err_cq en_err(priv, "Related WQE - qpn 0x%x, wqe index 0x%x, wqe size 0x%x\n", r= ing->qpn, wqe_index, desc_size); tx_desc =3D ring->buf + (wqe_index << LOG_TXBB_SIZE); - print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, 16, 1, tx_desc, desc= _size, false); + print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, 16, 1, tx_desc, desc= _size, 0); =20 if (test_and_set_bit(MLX4_EN_STATE_FLAG_RESTARTING, &priv->state)) return; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/= ethernet/mellanox/mlx5/core/en_tc.c index 6b3b1afe8312142e41014585b1bd2d68e9c5f23d..abbb9c23416b464661438c8d582= b3a8b9493ab72 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -3446,7 +3446,7 @@ static int verify_offload_pedit_fields(struct mlx5e_p= riv *priv, NL_SET_ERR_MSG_MOD(extack, "attempt to offload an unsupported field"); netdev_warn(priv->netdev, "attempt to offload an unsupported field (cmd= %d)\n", cmd); print_hex_dump(KERN_WARNING, "mask: ", DUMP_PREFIX_ADDRESS, - 16, 1, cmd_masks, sizeof(zero_masks), true); + 16, 1, cmd_masks, sizeof(zero_masks), DUMP_FLAG_ASCII); return -EOPNOTSUPP; } } diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c b/drivers/ne= t/ethernet/mellanox/mlx5/core/lib/aso.c index 58bd749b5e4de07a19320e223a0103b8ae7ded25..b9ac8e83400e9169b770ac930e1= 26efd1301baf2 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c @@ -415,7 +415,7 @@ int mlx5_aso_poll_cq(struct mlx5_aso *aso, bool with_da= ta) err_cqe->syndrome); print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, 16, 1, err_cqe, - sizeof(*err_cqe), false); + sizeof(*err_cqe), 0); } =20 mlx5_cqwq_update_db_record(&cq->wq); diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c b/= drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c index 424797b6d8020de4ecc09d3aa240bdc4c035f9f5..ec20ae27c6cd99981b44a07396e= 834389e1ccf60 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/hws/send.c @@ -440,7 +440,7 @@ static int mlx5hws_parse_cqe(struct mlx5hws_send_ring_c= q *cq, mlx5_core_err(cq->mdev, "syndrome=3D%x\n", err_cqe->syndrome); print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, 16, 1, err_cqe, - sizeof(*err_cqe), false); + sizeof(*err_cqe), 0); return CQ_POLL_ERR; } =20 diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.c b/drivers/net/eth= ernet/mellanox/mlx5/core/wq.c index 3091dd014650b5ce905549cbc9c75eeb608db9c4..a7e7e188901c7a8eb4b2b1ecdcc= c2a4b674f108a 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/wq.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.c @@ -86,7 +86,7 @@ void mlx5_wq_cyc_wqe_dump(struct mlx5_wq_cyc *wq, u16 ix,= u8 nstrides) =20 pr_info("WQE DUMP: WQ size %d WQ cur size %d, WQE index 0x%x, len: %zu\n", mlx5_wq_cyc_get_size(wq), wq->cur_sz, ix, len); - print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, 16, 1, wqe, len, fal= se); + print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, 16, 1, wqe, len, 0); } =20 void mlx5_wq_cyc_reset(struct mlx5_wq_cyc *wq) diff --git a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c b/drivers/net= /ethernet/mellanox/mlxfw/mlxfw_mfa2.c index e6f677e42007751d1f51f9749c1cf48177bb65ab..7a3ee42ead4b91e4de3ebd5dc84= ff8566884fdf6 100644 --- a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c +++ b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c @@ -147,7 +147,7 @@ mlxfw_mfa2_file_dev_validate(const struct mlxfw_mfa2_fi= le *mfa2_file, } =20 print_hex_dump_debug(" -- Device PSID ", DUMP_PREFIX_NONE, 16, 16, - psid->psid, be16_to_cpu(tlv->len), true); + psid->psid, be16_to_cpu(tlv->len), DUMP_FLAG_ASCII); =20 /* Validate the device has COMPONENT_PTR */ err =3D mlxfw_mfa2_tlv_multi_child_count(mfa2_file, multi, diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c b/drivers/net/ether= net/meta/fbnic/fbnic_fw.c index 8f7a2a19ddf8024e70670532dd908159101781b7..da3fded5367282815b2b8082f57= 575d9c1f81970 100644 --- a/drivers/net/ethernet/meta/fbnic/fbnic_fw.c +++ b/drivers/net/ethernet/meta/fbnic/fbnic_fw.c @@ -704,7 +704,7 @@ static void fbnic_mbx_process_rx_msgs(struct fbnic_dev = *fbd) err); print_hex_dump(KERN_WARNING, "fbnic:", DUMP_PREFIX_OFFSET, 16, 2, - msg, length, true); + msg, length, DUMP_FLAG_ASCII); } =20 dev_dbg(fbd->dev, "Parsed msg type %d\n", msg->hdr.type); diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethern= et/microchip/enc28j60.c index d6c9491537e47c58947291bd1c3271a137e26951..79fe8e3e958a916665789b526ab= 01e332902240e 100644 --- a/drivers/net/ethernet/microchip/enc28j60.c +++ b/drivers/net/ethernet/microchip/enc28j60.c @@ -891,7 +891,7 @@ static void dump_packet(const char *msg, int len, const= char *data) { printk(KERN_DEBUG DRV_NAME ": %s - packet len:%d\n", msg, len); print_hex_dump(KERN_DEBUG, "pk data: ", DUMP_PREFIX_OFFSET, 16, 1, - data, len, true); + data, len, DUMP_FLAG_ASCII); } =20 /* diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net= /ethernet/pensando/ionic/ionic_main.c index 0f817c3f92d820a0193a956b21ba6a2937de35b5..3e3ff01796dde572dad9a0f8bf0= 707c0749a1772 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_main.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c @@ -271,7 +271,7 @@ bool ionic_notifyq_service(struct ionic_cq *cq) =20 dev_dbg(lif->ionic->dev, "notifyq event:\n"); dynamic_hex_dump("event ", DUMP_PREFIX_OFFSET, 16, 1, - comp, sizeof(*comp), true); + comp, sizeof(*comp), DUMP_FLAG_ASCII); =20 switch (le16_to_cpu(comp->event.ecode)) { case IONIC_EVENT_LINK_CHANGE: @@ -327,7 +327,7 @@ bool ionic_adminq_service(struct ionic_cq *cq) =20 dev_dbg(q->dev, "comp admin queue command:\n"); dynamic_hex_dump("comp ", DUMP_PREFIX_OFFSET, 16, 1, - &ctx->comp, sizeof(ctx->comp), true); + &ctx->comp, sizeof(ctx->comp), DUMP_FLAG_ASCII); complete_all(&ctx->work); desc_info->ctx =3D NULL; } @@ -398,7 +398,7 @@ int ionic_adminq_post(struct ionic_lif *lif, struct ion= ic_admin_ctx *ctx) =20 dev_dbg(&lif->netdev->dev, "post admin queue command:\n"); dynamic_hex_dump("cmd ", DUMP_PREFIX_OFFSET, 16, 1, - &ctx->cmd, sizeof(ctx->cmd), true); + &ctx->cmd, sizeof(ctx->cmd), DUMP_FLAG_ASCII); =20 ionic_q_post(q, true); =20 diff --git a/drivers/net/ethernet/pensando/ionic/ionic_rx_filter.c b/driver= s/net/ethernet/pensando/ionic/ionic_rx_filter.c index 52811487767740a3128e45c4db0daaa365e73c0c..71b31938477714b8ec0f6b9ea29= 3ff9fd73fcf35 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_rx_filter.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_rx_filter.c @@ -41,7 +41,7 @@ void ionic_rx_filter_replay(struct ionic_lif *lif) memcpy(ac, &f->cmd, sizeof(f->cmd)); dev_dbg(&lif->netdev->dev, "replay filter command:\n"); dynamic_hex_dump("cmd ", DUMP_PREFIX_OFFSET, 16, 1, - &ctx.cmd, sizeof(ctx.cmd), true); + &ctx.cmd, sizeof(ctx.cmd), DUMP_FLAG_ASCII); =20 err =3D ionic_adminq_post_wait(lif, &ctx); if (err) { diff --git a/drivers/net/ethernet/qlogic/qed/qed_ll2.c b/drivers/net/ethern= et/qlogic/qed/qed_ll2.c index ab5ef254a74832948eb46180cdd3ad2dcc51d939..a911ad9c31a7f97199509e29d90= 900b1dc2ddea6 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_ll2.c +++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.c @@ -185,7 +185,7 @@ static void qed_ll2b_complete_rx_packet(void *cxt, if ((cdev->dp_module & NETIF_MSG_PKTDATA) && buffer->data) { print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, - buffer->data, data->length.packet_length, false); + buffer->data, data->length.packet_length, 0); } =20 /* Determine if data is valid */ diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/e= thernet/qlogic/qlcnic/qlcnic_io.c index b9dc0071c5de46deaad545e00abe336497d334c3..9999620f0f92ccd169f5e3662c4= 82065023fc69c 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c @@ -1484,7 +1484,7 @@ static void dump_skb(struct sk_buff *skb, struct qlcn= ic_adapter *adapter) dev_name(&adapter->pdev->dev), __func__); =20 print_hex_dump_debug(prefix, DUMP_PREFIX_NONE, 16, 1, - skb->data, skb->len, true); + skb->data, skb->len, DUMP_FLAG_ASCII); } } =20 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net= /ethernet/qlogic/qlcnic/qlcnic_main.c index eb69121df726cbed32a60c64269e06a0b6a844e3..03753509b9007d1c460873a349d= a69018f3ff93c 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -2945,7 +2945,7 @@ static inline void dump_tx_ring_desc(struct qlcnic_ho= st_tx_ring *tx_ring) pr_info("TX Desc: %d\n", i); print_hex_dump(KERN_INFO, "TX: ", DUMP_PREFIX_OFFSET, 16, 1, &tx_ring->desc_head[i], - sizeof(struct cmd_desc_type0), true); + sizeof(struct cmd_desc_type0), DUMP_FLAG_ASCII); } } =20 diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/= realtek/8139too.c index 9ce0e8a64ba83ee8d10b5f4f0fa84da84d87f363..9d793bca1138296c988dd0ad733= 72c389ddf253a 100644 --- a/drivers/net/ethernet/realtek/8139too.c +++ b/drivers/net/ethernet/realtek/8139too.c @@ -1979,7 +1979,7 @@ static int rtl8139_rx(struct net_device *dev, struct = rtl8139_private *tp, #if RTL8139_DEBUG > 2 print_hex_dump(KERN_DEBUG, "Frame contents: ", DUMP_PREFIX_OFFSET, 16, 1, - &rx_ring[ring_offset], 70, true); + &rx_ring[ring_offset], 70, DUMP_FLAG_ASCII); #endif =20 /* Packet copy from FIFO still in progress. diff --git a/drivers/net/ethernet/smsc/smc9194.c b/drivers/net/ethernet/sms= c/smc9194.c index e2e7b1c68563927f17a7808f813510fff46f1fe8..b4fdcd98d02d69151113037bc8a= 638fdadeb3c75 100644 --- a/drivers/net/ethernet/smsc/smc9194.c +++ b/drivers/net/ethernet/smsc/smc9194.c @@ -1033,7 +1033,7 @@ static void print_packet( byte * buf, int length ) { #if 0 print_hex_dump_debug(DRV_NAME, DUMP_PREFIX_OFFSET, 16, 1, - buf, length, true); + buf, length, DUMP_FLAG_ASCII); #endif } #endif diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/etherne= t/vertexcom/mse102x.c index 89dc4c401a8de45d84e03263a393dc71f2283c1b..da0648d3983cf7a9a1c2293e94e= 7afef0de316b9 100644 --- a/drivers/net/ethernet/vertexcom/mse102x.c +++ b/drivers/net/ethernet/vertexcom/mse102x.c @@ -299,7 +299,7 @@ static void mse102x_dump_packet(const char *msg, int le= n, const char *data) { printk(KERN_DEBUG ": %s - packet len:%d\n", msg, len); print_hex_dump(KERN_DEBUG, "pk data: ", DUMP_PREFIX_OFFSET, 16, 1, - data, len, true); + data, len, DUMP_FLAG_ASCII); } =20 static void mse102x_rx_pkt_spi(struct mse102x_net *mse) diff --git a/drivers/net/fddi/skfp/skfddi.c b/drivers/net/fddi/skfp/skfddi.c index a273362c9e703ce8f807ae86e4705565ab51c605..961300581c05fd6460ac4b0ccd3= 5233e70f1cbf8 100644 --- a/drivers/net/fddi/skfp/skfddi.c +++ b/drivers/net/fddi/skfp/skfddi.c @@ -1529,7 +1529,7 @@ void mac_drv_tx_complete(struct s_smc *smc, volatile = struct s_smt_fp_txd *txd) void dump_data(unsigned char *Data, int length) { printk(KERN_INFO "---Packet start---\n"); - print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE, 16, 1, Data, min_t(size_t= , length, 64), false); + print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE, 16, 1, Data, min_t(size_t= , length, 64), 0); printk(KERN_INFO "------------------\n"); } // dump_data #else diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 7dbcbf0a4ee26a221e9c47a6f030c8a18317bdbb..113b2c18e7904c40c99425a3a3e= fbcaade68beb4 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -2270,8 +2270,8 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool rep= ort) dev_err(sfp->dev, "EEPROM base structure checksum failure: 0x%02x !=3D 0x%02x\n", check, id.base.cc_base); - print_hex_dump(KERN_ERR, "sfp EE: ", DUMP_PREFIX_OFFSET, - 16, 1, &id, sizeof(id), true); + print_hex_dump(KERN_ERR, "sfp EE: ", DUMP_PREFIX_OFFSET, 16, 1, + &id, sizeof(id), DUMP_FLAG_ASCII); return -EINVAL; } } @@ -2299,8 +2299,8 @@ static int sfp_sm_mod_probe(struct sfp *sfp, bool rep= ort) dev_err(sfp->dev, "EEPROM extended structure checksum failure: 0x%02x !=3D 0x%02x\n", check, id.ext.cc_ext); - print_hex_dump(KERN_ERR, "sfp EE: ", DUMP_PREFIX_OFFSET, - 16, 1, &id, sizeof(id), true); + print_hex_dump(KERN_ERR, "sfp EE: ", DUMP_PREFIX_OFFSET, 16, 1, + &id, sizeof(id), DUMP_FLAG_ASCII); memset(&id.ext, 0, sizeof(id.ext)); } } diff --git a/drivers/net/tun.c b/drivers/net/tun.c index d7a865ef370b6968c095510ae16b5196e30e54b9..57d96b2f3009f5df5785cb68107= 7f8e35165f2a5 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2138,7 +2138,8 @@ static ssize_t tun_put_user(struct tun_struct *tun, print_hex_dump(KERN_ERR, "tun: ", DUMP_PREFIX_NONE, 16, 1, skb->head, - min((int)tun16_to_cpu(tun, gso.hdr_len), 64), true); + min((int)tun16_to_cpu(tun, gso.hdr_len), 64), + DUMP_FLAG_ASCII); } WARN_ON_ONCE(1); return -EINVAL; diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wirel= ess/ath/wcn36xx/wcn36xx.h index 7ee79593cd23dcc81dff7fca9c6a2cae3931731e..9aad23d7e8a4961b8ee8492ddee= 43a8be6863263 100644 --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h @@ -74,7 +74,7 @@ enum wcn36xx_debug_mask { if (wcn36xx_dbg_mask & mask) \ print_hex_dump(KERN_DEBUG, pr_fmt(prefix_str), \ DUMP_PREFIX_OFFSET, 32, 1, \ - buf, len, false); \ + buf, len, 0); \ } while (0) =20 enum wcn36xx_ampdu_state { diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wire= less/ath/wil6210/cfg80211.c index a1a0a9223e74acc1cbef2e2b05e5d20dbad66ade..8cdb7e8589df05e83561cbfa76b= 8f207bf0a39a2 100644 --- a/drivers/net/wireless/ath/wil6210/cfg80211.c +++ b/drivers/net/wireless/ath/wil6210/cfg80211.c @@ -1112,7 +1112,7 @@ static void wil_print_connect_params(struct wil6210_p= riv *wil, wil_info(wil, " BSSID: %pM\n", sme->bssid); if (sme->ssid) print_hex_dump(KERN_INFO, " SSID: ", DUMP_PREFIX_OFFSET, - 16, 1, sme->ssid, sme->ssid_len, true); + 16, 1, sme->ssid, sme->ssid_len, DUMP_FLAG_ASCII); if (sme->prev_bssid) wil_info(wil, " Previous BSSID=3D%pM\n", sme->prev_bssid); wil_info(wil, " Auth Type: %s\n", diff --git a/drivers/net/wireless/ath/wil6210/ethtool.c b/drivers/net/wirel= ess/ath/wil6210/ethtool.c index 29a9f17c2df09176293b9cf05116264c2129c643..58d0680f53973943a61cdfd2907= 1b178c6fba0f1 100644 --- a/drivers/net/wireless/ath/wil6210/ethtool.c +++ b/drivers/net/wireless/ath/wil6210/ethtool.c @@ -95,7 +95,7 @@ wil_ethtoolops_set_coalesce(struct net_device *ndev, out_bad: wil_dbg_misc(wil, "Unsupported coalescing params. Raw command:\n"); print_hex_dump_debug("DBG[MISC] coal ", DUMP_PREFIX_OFFSET, 16, 4, - cp, sizeof(*cp), false); + cp, sizeof(*cp), 0); mutex_unlock(&wil->mutex); return -EINVAL; } diff --git a/drivers/net/wireless/ath/wil6210/fw_inc.c b/drivers/net/wirele= ss/ath/wil6210/fw_inc.c index c3c0b289dcf3bc5add1d32adafcf6e6311ff63fc..36b0a84677172b04c2fdd550b02= 545214201a9f1 100644 --- a/drivers/net/wireless/ath/wil6210/fw_inc.c +++ b/drivers/net/wireless/ath/wil6210/fw_inc.c @@ -14,7 +14,8 @@ groupsize, buf, len, ascii) \ print_hex_dump_debug("DBG[ FW ]" prefix_str, \ prefix_type, rowsize, \ - groupsize, buf, len, ascii) + groupsize, buf, len, \ + ascii ? DUMP_FLAG_ASCII : 0) =20 static bool wil_fw_addr_check(struct wil6210_priv *wil, void __iomem **ioaddr, __le32 val, diff --git a/drivers/net/wireless/ath/wil6210/txrx_edma.c b/drivers/net/wir= eless/ath/wil6210/txrx_edma.c index 1ba1f21ebea26f971c9b8bbb964d0102ebae7807..a0e5a9c5ad6db8e5c93db1d43e1= 3ae09017de768 100644 --- a/drivers/net/wireless/ath/wil6210/txrx_edma.c +++ b/drivers/net/wireless/ath/wil6210/txrx_edma.c @@ -904,7 +904,7 @@ static struct sk_buff *wil_sring_reap_rx_edma(struct wi= l6210_priv *wil, print_hex_dump(KERN_ERR, "RxS ", DUMP_PREFIX_OFFSET, 16, 1, msg, wil->use_compressed_rx_status ? sizeof(struct wil_rx_status_compressed) : - sizeof(struct wil_rx_status_extended), false); + sizeof(struct wil_rx_status_extended), 0); =20 wil_rx_status_reset_buff_id(sring); wil_sring_advance_swhead(sring); @@ -969,7 +969,7 @@ static struct sk_buff *wil_sring_reap_rx_edma(struct wi= l6210_priv *wil, print_hex_dump(KERN_ERR, "RxS ", DUMP_PREFIX_OFFSET, 16, 1, msg, wil->use_compressed_rx_status ? sizeof(struct wil_rx_status_compressed) : - sizeof(struct wil_rx_status_extended), false); + sizeof(struct wil_rx_status_extended), 0); =20 stats->rx_large_frame++; rxdata->skipping =3D true; diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wirel= ess/ath/wil6210/wil6210.h index 9bd1286d2857b09774bc1faf80fb87c6a4723f8c..edb257a1e653eadcfd56901aae8= d0d1742ff9e9f 100644 --- a/drivers/net/wireless/ath/wil6210/wil6210.h +++ b/drivers/net/wireless/ath/wil6210/wil6210.h @@ -1162,19 +1162,22 @@ void wil_get_board_file(struct wil6210_priv *wil, c= har *buf, size_t len); groupsize, buf, len, ascii) \ print_hex_dump_debug("DBG[TXRX]" prefix_str,\ prefix_type, rowsize, \ - groupsize, buf, len, ascii) + groupsize, buf, len, \ + ascii ? DUMP_FLAG_ASCII : 0) =20 #define wil_hex_dump_wmi(prefix_str, prefix_type, rowsize, \ groupsize, buf, len, ascii) \ print_hex_dump_debug("DBG[ WMI]" prefix_str,\ prefix_type, rowsize, \ - groupsize, buf, len, ascii) + groupsize, buf, len, \ + ascii ? DUMP_FLAG_ASCII : 0) =20 #define wil_hex_dump_misc(prefix_str, prefix_type, rowsize, \ groupsize, buf, len, ascii) \ print_hex_dump_debug("DBG[MISC]" prefix_str,\ prefix_type, rowsize, \ - groupsize, buf, len, ascii) + groupsize, buf, len, \ + ascii ? DUMP_FLAG_ASCII : 0) #else /* defined(CONFIG_DYNAMIC_DEBUG) */ static inline void wil_hex_dump_txrx(const char *prefix_str, int prefix_type, int rowsiz= e, diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/= ath/wil6210/wmi.c index 8ff69dc72fb943da777d1932aca781f41784b756..0c4936301c7d254e52becaddd23= 08052d426954c 100644 --- a/drivers/net/wireless/ath/wil6210/wmi.c +++ b/drivers/net/wireless/ath/wil6210/wmi.c @@ -3376,7 +3376,7 @@ static void wmi_event_handle(struct wil6210_priv *wil, } else { wil_err(wil, "Unknown event type\n"); print_hex_dump(KERN_ERR, "evt?? ", DUMP_PREFIX_OFFSET, 16, 1, - hdr, sizeof(*hdr) + len, true); + hdr, sizeof(*hdr) + len, DUMP_FLAG_ASCII); } } =20 diff --git a/drivers/net/wireless/broadcom/b43/main.c b/drivers/net/wireles= s/broadcom/b43/main.c index 25b4ef9d3c9a100314d4a6dd0da7add3befe1279..1108b5174255d8f81d21e6257c1= ae48cca836183 100644 --- a/drivers/net/wireless/broadcom/b43/main.c +++ b/drivers/net/wireless/broadcom/b43/main.c @@ -1918,7 +1918,7 @@ static void handle_irq_ucode_debug(struct b43_wldev *= dev) } b43info(dev->wl, "Shared memory dump:\n"); print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, - 16, 2, buf, 4096, 1); + 16, 2, buf, 4096, DUMP_FLAG_ASCII); kfree(buf); break; case B43_DEBUGIRQ_DUMP_REGS: diff --git a/drivers/net/wireless/intel/iwlegacy/common.h b/drivers/net/wir= eless/intel/iwlegacy/common.h index 725c2a88ddb782c53fff14f3ad73078d5a8aa3cb..0fa9fc77bd2f77e4652bce9095a= 0f88c30559f8e 100644 --- a/drivers/net/wireless/intel/iwlegacy/common.h +++ b/drivers/net/wireless/intel/iwlegacy/common.h @@ -2931,7 +2931,8 @@ il_get_debug_level(struct il_priv *il) #define il_print_hex_error(il, p, len) \ do { \ print_hex_dump(KERN_ERR, "iwl data: ", \ - DUMP_PREFIX_OFFSET, 16, 1, p, len, 1); \ + DUMP_PREFIX_OFFSET, 16, 1, p, len, \ + DUMP_FLAG_ASCII); \ } while (0) =20 #ifdef CONFIG_IWLEGACY_DEBUG @@ -2946,7 +2947,8 @@ do { \ do { \ if (il_get_debug_level(il) & level) \ print_hex_dump(KERN_DEBUG, "iwl data: ", \ - DUMP_PREFIX_OFFSET, 16, 1, p, len, 1); \ + DUMP_PREFIX_OFFSET, 16, 1, p, len, \ + DUMP_FLAG_ASCII); \ } while (0) =20 #else diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-debug.h b/drivers/net/w= ireless/intel/iwlwifi/iwl-debug.h index 1b9f16a31b546e7df3748cf6339ab60c45b65f76..00a4cf9773b72ea626ca1bdf6d1= c4988e5d86222 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-debug.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-debug.h @@ -82,7 +82,8 @@ __iwl_dbg(struct device *dev, #define iwl_print_hex_error(m, p, len) \ do { \ print_hex_dump(KERN_ERR, "iwl data: ", \ - DUMP_PREFIX_OFFSET, 16, 1, p, len, 1); \ + DUMP_PREFIX_OFFSET, 16, 1, p, len, \ + DUMP_FLAG_ASCII); \ } while (0) =20 #define __IWL_DEBUG_DEV(dev, level, limit, fmt, args...) \ @@ -102,7 +103,8 @@ do { \ do { \ if (iwl_have_debug_level(level)) \ print_hex_dump(KERN_DEBUG, "iwl data: ", \ - DUMP_PREFIX_OFFSET, 16, 1, p, len, 1); \ + DUMP_PREFIX_OFFSET, 16, 1, p, len, \ + DUMP_FLAG_ASCII); \ } while (0) #else #define iwl_print_hex_dump(m, level, p, len) diff --git a/drivers/net/wireless/marvell/mwifiex/main.h b/drivers/net/wire= less/marvell/mwifiex/main.h index 0674dcf7a53745b6ff16971d3bb6f2ecabfb8690..93593e37413e6f9a4426681f4a1= a9bb1e61e6b66 100644 --- a/drivers/net/wireless/marvell/mwifiex/main.h +++ b/drivers/net/wireless/marvell/mwifiex/main.h @@ -201,7 +201,7 @@ do { \ if ((adapter)->debug_mask & MWIFIEX_DBG_##dbg_mask) \ print_hex_dump(KERN_DEBUG, str, \ DUMP_PREFIX_OFFSET, 16, 1, \ - buf, len, false); \ + buf, len, 0); \ } while (0) =20 /** Min BGSCAN interval 15 second */ diff --git a/drivers/net/wireless/realtek/rtl8xxxu/core.c b/drivers/net/wir= eless/realtek/rtl8xxxu/core.c index f95898f68d68a5788d4ce0d4290a38d4d20f7ada..c3dbf9c3b403ae51424b296d6cc= 200e03c9d89f8 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/core.c @@ -1897,7 +1897,7 @@ static void rtl8xxxu_dump_efuse(struct rtl8xxxu_priv = *priv) priv->chip_name, EFUSE_MAP_LEN); =20 print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, - priv->efuse_wifi.raw, EFUSE_MAP_LEN, true); + priv->efuse_wifi.raw, EFUSE_MAP_LEN, DUMP_FLAG_ASCII); } =20 void rtl8xxxu_reset_8051(struct rtl8xxxu_priv *priv) @@ -6230,7 +6230,7 @@ static void rtl8723bu_handle_c2h(struct rtl8xxxu_priv= *priv, dev_info(dev, "Unhandled C2H event %02x seq %02x\n", c2h->id, c2h->seq); print_hex_dump(KERN_INFO, "C2H content: ", DUMP_PREFIX_NONE, - 16, 1, c2h->raw.payload, len, false); + 16, 1, c2h->raw.payload, len, 0); break; } =20 diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723x.c b/drivers/net/wi= reless/realtek/rtw88/rtw8723x.c index 69f73cb5b4cd5bec4dc0cccbb22c42ba52ede655..b3453beec06f4d56de6de2a6ce6= f1201e17b1242 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw8723x.c +++ b/drivers/net/wireless/realtek/rtw88/rtw8723x.c @@ -181,7 +181,7 @@ static void efuse_debug_dump(struct rtw_dev *rtwdev, =20 rtw_dbg(rtwdev, RTW_DBG_EFUSE, "EFUSE raw logical map:\n"); print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1, - (u8 *)map, sizeof(struct rtw8723x_efuse), false); + (u8 *)map, sizeof(struct rtw8723x_efuse), 0); rtw_dbg(rtwdev, RTW_DBG_EFUSE, "Parsed rtw8723x EFUSE data:\n"); DBG_EFUSE_VAL(rtwdev, map, rtl_id); DBG_EFUSE_VAL(rtwdev, map, afe); diff --git a/drivers/net/wireless/realtek/rtw88/rtw88xxa.c b/drivers/net/wi= reless/realtek/rtw88/rtw88xxa.c index 71e61b9c0becfab8c5a81e962ce858bd7162ab2d..e4255a26299f9eda368efe1f9bc= cd982ec22cb98 100644 --- a/drivers/net/wireless/realtek/rtw88/rtw88xxa.c +++ b/drivers/net/wireless/realtek/rtw88/rtw88xxa.c @@ -209,7 +209,7 @@ int rtw88xxa_read_efuse(struct rtw_dev *rtwdev, u8 *log= _map) =20 if (rtw_dbg_is_enabled(rtwdev, RTW_DBG_EFUSE)) print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, - log_map, chip->log_efuse_size, true); + log_map, chip->log_efuse_size, DUMP_FLAG_ASCII); =20 map =3D (struct rtw88xxa_efuse *)log_map; =20 diff --git a/drivers/net/wireless/silabs/wfx/bh.c b/drivers/net/wireless/si= labs/wfx/bh.c index 21dfdcf9cc27345e566c5dedcbd618d41283f0f7..3bf68dd8c96064b6412b833df85= bd3e9e6b547b1 100644 --- a/drivers/net/wireless/silabs/wfx/bh.c +++ b/drivers/net/wireless/silabs/wfx/bh.c @@ -93,7 +93,7 @@ static int rx_helper(struct wfx_dev *wdev, size_t read_le= n, int *is_cnf) dev_err(wdev->dev, "inconsistent message length: %zu !=3D %zu\n", computed_len, read_len); print_hex_dump(KERN_INFO, "hif: ", DUMP_PREFIX_OFFSET, 16, 1, - hif, read_len, true); + hif, read_len, DUMP_FLAG_ASCII); goto err; } =20 diff --git a/drivers/net/wireless/silabs/wfx/hif_rx.c b/drivers/net/wireles= s/silabs/wfx/hif_rx.c index 64ca8acb8e4f2b1cb989cc559679d70467c4ef70..d06de5fcac87d56305bfdf9f545= cc0eb1c5133b7 100644 --- a/drivers/net/wireless/silabs/wfx/hif_rx.c +++ b/drivers/net/wireless/silabs/wfx/hif_rx.c @@ -313,7 +313,7 @@ static int wfx_hif_error_indication(struct wfx_dev *wde= v, else dev_err(wdev->dev, "asynchronous error: unknown: %08x\n", type); print_hex_dump(KERN_INFO, "hif: ", DUMP_PREFIX_OFFSET, - 16, 1, hif, le16_to_cpu(hif->len), false); + 16, 1, hif, le16_to_cpu(hif->len), 0); wdev->chip_frozen =3D true; =20 return 0; @@ -330,7 +330,7 @@ static int wfx_hif_exception_indication(struct wfx_dev = *wdev, else dev_err(wdev->dev, "firmware exception\n"); print_hex_dump(KERN_INFO, "hif: ", DUMP_PREFIX_OFFSET, - 16, 1, hif, le16_to_cpu(hif->len), false); + 16, 1, hif, le16_to_cpu(hif->len), 0); wdev->chip_frozen =3D true; =20 return -1; diff --git a/drivers/net/wireless/ti/wl1251/wl1251.h b/drivers/net/wireless= /ti/wl1251/wl1251.h index 83adbc3c25dca1242e3b867efe27634202ab93e9..9ae40c151ea5b3b050bb390f4d7= 96daf0e2c614a 100644 --- a/drivers/net/wireless/ti/wl1251/wl1251.h +++ b/drivers/net/wireless/ti/wl1251/wl1251.h @@ -75,7 +75,7 @@ enum { DUMP_PREFIX_OFFSET, 16, 1, \ buf, \ min_t(size_t, len, DEBUG_DUMP_LIMIT), \ - true); \ + DUMP_FLAG_ASCII); \ } while (0) =20 #define WL1251_DEFAULT_RX_CONFIG (CFG_UNI_FILTER_EN | \ diff --git a/drivers/net/wireless/ti/wlcore/debug.h b/drivers/net/wireless/= ti/wlcore/debug.h index 2ffa6d67225a5b1734f58b9ba10eac5e413b1361..13464409b71c20b4902376687de= 996ef768802a0 100644 --- a/drivers/net/wireless/ti/wlcore/debug.h +++ b/drivers/net/wireless/ti/wlcore/debug.h @@ -92,7 +92,7 @@ extern u32 wl12xx_debug_level; DUMP_PREFIX_OFFSET, 16, 1, \ buf, \ min_t(size_t, len, DEBUG_DUMP_LIMIT), \ - true); \ + DUMP_FLAG_ASCII); \ } while (0) =20 #endif /* __DEBUG_H__ */ diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/t= i/wlcore/sdio.c index a73207bbe5d7a3c13628d62933e36a6ea30def5b..316553945818b0264d87429df5c= 294dac61bb070 100644 --- a/drivers/net/wireless/ti/wlcore/sdio.c +++ b/drivers/net/wireless/ti/wlcore/sdio.c @@ -81,7 +81,7 @@ static int __must_check wl12xx_sdio_raw_read(struct devic= e *child, int addr, printk(KERN_DEBUG "wlcore_sdio: READ from 0x%04x\n", addr); print_hex_dump(KERN_DEBUG, "wlcore_sdio: READ ", DUMP_PREFIX_OFFSET, 16, 1, - buf, len, false); + buf, len, 0); } =20 return ret; @@ -100,7 +100,7 @@ static int __must_check wl12xx_sdio_raw_write(struct de= vice *child, int addr, printk(KERN_DEBUG "wlcore_sdio: WRITE to 0x%04x\n", addr); print_hex_dump(KERN_DEBUG, "wlcore_sdio: WRITE ", DUMP_PREFIX_OFFSET, 16, 1, - buf, len, false); + buf, len, 0); } =20 if (unlikely(addr =3D=3D HW_ACCESS_ELP_CTRL_REG)) { diff --git a/drivers/nfc/mei_phy.c b/drivers/nfc/mei_phy.c index f9cca885beec6bc14f04fbe24ba03350ead385ac..c28ab7481808a44040777c94baa= a26447f2cbcf8 100644 --- a/drivers/nfc/mei_phy.c +++ b/drivers/nfc/mei_phy.c @@ -71,14 +71,14 @@ struct mei_nfc_connect_resp { do { \ pr_debug("%s:\n", info); \ print_hex_dump_debug("mei in : ", DUMP_PREFIX_OFFSET, \ - 16, 1, (skb)->data, (skb)->len, false); \ + 16, 1, (skb)->data, (skb)->len, 0); \ } while (0) =20 #define MEI_DUMP_SKB_OUT(info, skb) \ do { \ pr_debug("%s:\n", info); \ print_hex_dump_debug("mei out: ", DUMP_PREFIX_OFFSET, \ - 16, 1, (skb)->data, (skb)->len, false); \ + 16, 1, (skb)->data, (skb)->len, 0); \ } while (0) =20 #define MEI_DUMP_NFC_HDR(info, _hdr) \ diff --git a/drivers/nfc/pn533/i2c.c b/drivers/nfc/pn533/i2c.c index 132c050a365d67b1d6a95eea125a4c85aa92e3df..73dc30f97afb738bfebb493688d= a89b351c7d31d 100644 --- a/drivers/nfc/pn533/i2c.c +++ b/drivers/nfc/pn533/i2c.c @@ -60,7 +60,7 @@ static int pn533_i2c_send_frame(struct pn533 *dev, phy->aborted =3D false; =20 print_hex_dump_debug("PN533_i2c TX: ", DUMP_PREFIX_NONE, 16, 1, - out->data, out->len, false); + out->data, out->len, 0); =20 rc =3D i2c_master_send(client, out->data, out->len); =20 diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index e2bc67300a915a232d3b21236e4301e9b163dc6a..6ddca7e023930664b7f41ffba79= 8aeac2d195127 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c @@ -2191,7 +2191,7 @@ void pn533_recv_frame(struct pn533 *dev, struct sk_bu= ff *skb, int status) } =20 print_hex_dump_debug("PN533 RX: ", DUMP_PREFIX_NONE, 16, 1, skb->data, - dev->ops->rx_frame_size(skb->data), false); + dev->ops->rx_frame_size(skb->data), 0); =20 if (!dev->ops->rx_is_frame_valid(skb->data, dev)) { nfc_err(dev->dev, "Received an invalid frame\n"); diff --git a/drivers/nfc/pn533/uart.c b/drivers/nfc/pn533/uart.c index cfbbe0713317f8e5ca9b3a4942373376febfa248..a81dd65a049eb31c01de228a680= ff8286276c01a 100644 --- a/drivers/nfc/pn533/uart.c +++ b/drivers/nfc/pn533/uart.c @@ -53,7 +53,7 @@ static int pn532_uart_send_frame(struct pn533 *dev, int err; =20 print_hex_dump_debug("PN532_uart TX: ", DUMP_PREFIX_NONE, 16, 1, - out->data, out->len, false); + out->data, out->len, 0); =20 pn532->cur_out_buf =3D out; if (pn532->send_wakeup) { diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c index ffd7367ce11945ad74c2e2293c8be48e755918b0..ae3c98970cc8b5c100cdd80e830= 9933ac678257f 100644 --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c @@ -172,8 +172,7 @@ static int pn533_usb_send_frame(struct pn533 *dev, phy->out_urb->transfer_buffer =3D out->data; phy->out_urb->transfer_buffer_length =3D out->len; =20 - print_hex_dump_debug("PN533 TX: ", DUMP_PREFIX_NONE, 16, 1, - out->data, out->len, false); + print_hex_dump_debug("PN533 TX: ", DUMP_PREFIX_NONE, 16, 1, out->data, ou= t->len, 0); =20 arg.phy =3D phy; init_completion(&arg.done); @@ -369,8 +368,7 @@ static void pn533_acr122_poweron_rdr_resp(struct urb *u= rb) struct pn533_acr122_poweron_rdr_arg *arg =3D urb->context; =20 print_hex_dump_debug("ACR122 RX: ", DUMP_PREFIX_NONE, 16, 1, - urb->transfer_buffer, urb->transfer_buffer_length, - false); + urb->transfer_buffer, urb->transfer_buffer_length, 0); =20 arg->rc =3D urb->status; complete(&arg->done); @@ -397,8 +395,7 @@ static int pn533_acr122_poweron_rdr(struct pn533_usb_ph= y *phy) phy->in_urb->complete =3D pn533_acr122_poweron_rdr_resp; phy->in_urb->context =3D &arg; =20 - print_hex_dump_debug("ACR122 TX: ", DUMP_PREFIX_NONE, 16, 1, - cmd, sizeof(cmd), false); + print_hex_dump_debug("ACR122 TX: ", DUMP_PREFIX_NONE, 16, 1, cmd, sizeof(= cmd), 0); =20 rc =3D usb_bulk_msg(phy->udev, phy->out_urb->pipe, buffer, sizeof(cmd), &transferred, 5000); diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c index a0dfb3f98d5a9f5810dec64cfba8526ea405e460..8e6f358ee161b18764e9639e193= 532b08a493afc 100644 --- a/drivers/nfc/pn544/i2c.c +++ b/drivers/nfc/pn544/i2c.c @@ -336,7 +336,7 @@ static int check_crc(u8 *buf, int buflen) crc, buf[len - 1], buf[len - 2]); pr_info("%s: BAD CRC\n", __func__); print_hex_dump(KERN_DEBUG, "crc: ", DUMP_PREFIX_NONE, - 16, 2, buf, buflen, false); + 16, 2, buf, buflen, 0); return -EPERM; } return 0; diff --git a/drivers/nfc/pn544/pn544.c b/drivers/nfc/pn544/pn544.c index 32a61a1851422bf1d5bee4ba5d7711da401f5053..3b888cbb3b6d11ddfb2cf17856a= 4f6b27ad69475 100644 --- a/drivers/nfc/pn544/pn544.c +++ b/drivers/nfc/pn544/pn544.c @@ -315,7 +315,7 @@ static int pn544_hci_ready(struct nfc_hci_dev *hdev) =20 print_hex_dump(KERN_DEBUG, "FULL VERSION SOFTWARE INFO: ", DUMP_PREFIX_NONE, 16, 1, - skb->data, FULL_VERSION_LEN, false); + skb->data, FULL_VERSION_LEN, 0); =20 kfree_skb(skb); =20 @@ -457,7 +457,7 @@ static int pn544_hci_dep_link_up(struct nfc_hci_dev *hd= ev, goto exit; } print_hex_dump(KERN_DEBUG, "remote gb: ", DUMP_PREFIX_OFFSET, - 16, 1, rgb_skb->data, rgb_skb->len, true); + 16, 1, rgb_skb->data, rgb_skb->len, DUMP_FLAG_ASCII); =20 r =3D nfc_set_remote_general_bytes(hdev->ndev, rgb_skb->data, rgb_skb->len); diff --git a/drivers/nfc/port100.c b/drivers/nfc/port100.c index 00d8ea6dcb5dbad081bbd539fdea2689451a83fd..a488b405fcc93fb1374ca710b5b= b7bd741e51850 100644 --- a/drivers/nfc/port100.c +++ b/drivers/nfc/port100.c @@ -643,7 +643,7 @@ static void port100_recv_response(struct urb *urb) } =20 print_hex_dump_debug("PORT100 RX: ", DUMP_PREFIX_NONE, 16, 1, in_frame, - port100_rx_frame_size(in_frame), false); + port100_rx_frame_size(in_frame), 0); =20 if (!port100_rx_frame_is_cmd_response(dev, in_frame)) { nfc_err(&dev->interface->dev, @@ -778,7 +778,7 @@ static int port100_send_frame_async(struct port100 *dev, dev->in_urb->transfer_buffer_length =3D in_len; =20 print_hex_dump_debug("PORT100 TX: ", DUMP_PREFIX_NONE, 16, 1, - out->data, out->len, false); + out->data, out->len, 0); =20 rc =3D usb_submit_urb(dev->out_urb, GFP_KERNEL); if (rc) diff --git a/drivers/nfc/st21nfca/core.c b/drivers/nfc/st21nfca/core.c index 161caf2675cfc43b580f360283c1c2e495cd415a..07f6d58b123c478157bac948669= 69d3a878f65eb 100644 --- a/drivers/nfc/st21nfca/core.c +++ b/drivers/nfc/st21nfca/core.c @@ -297,7 +297,7 @@ static int st21nfca_hci_ready(struct nfc_hci_dev *hdev) =20 print_hex_dump(KERN_DEBUG, "FULL VERSION SOFTWARE INFO: ", DUMP_PREFIX_NONE, 16, 1, - skb->data, FULL_VERSION_LEN, false); + skb->data, FULL_VERSION_LEN, 0); =20 kfree_skb(skb); =20 diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index 02c3d11a19c436d6a3607be1f2ff50d13e88bb1e..4eb037da32598dfdef5fa41d4b6= d0ecb3c18dd81 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c @@ -274,7 +274,7 @@ static int check_crc(u8 *buf, int buflen) =20 pr_info(DRIVER_DESC ": %s : BAD CRC\n", __func__); print_hex_dump(KERN_DEBUG, "crc: ", DUMP_PREFIX_NONE, - 16, 2, buf, buflen, false); + 16, 2, buf, buflen, 0); return -EPERM; } return 0; diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c index 9e1a34e23af26e0a2bd7e18b4e3fe5f6726f560d..59e76f7d00b0dee184bf7ec4a24= 27c622b614ad4 100644 --- a/drivers/nfc/trf7970a.c +++ b/drivers/nfc/trf7970a.c @@ -609,9 +609,8 @@ static void trf7970a_send_upstream(struct trf7970a *trf) trf->tx_skb =3D NULL; =20 if (trf->rx_skb && !IS_ERR(trf->rx_skb) && !trf->aborting) - print_hex_dump_debug("trf7970a rx data: ", DUMP_PREFIX_NONE, - 16, 1, trf->rx_skb->data, trf->rx_skb->len, - false); + print_hex_dump_debug("trf7970a rx data: ", DUMP_PREFIX_NONE, 16, 1, + trf->rx_skb->data, trf->rx_skb->len, 0); =20 trf->state =3D TRF7970A_ST_IDLE; =20 @@ -652,8 +651,7 @@ static int trf7970a_transmit(struct trf7970a *trf, stru= ct sk_buff *skb, unsigned int timeout; int ret; =20 - print_hex_dump_debug("trf7970a tx data: ", DUMP_PREFIX_NONE, - 16, 1, skb->data, len, false); + print_hex_dump_debug("trf7970a tx data: ", DUMP_PREFIX_NONE, 16, 1, skb->= data, len, 0); =20 spi_message_init(&m); =20 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 2e81ab0f5a25cb7fa5ac8f4e3ca39de21abbbc10..7ed1ac87824fb4496736ce40a57= 64051fe6b85fe 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1863,7 +1863,7 @@ static void early_dump_pci_device(struct pci_dev *pde= v) pci_read_config_dword(pdev, i, &value[i / 4]); =20 print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 1, - value, 256, false); + value, 256, 0); } =20 static const char *pci_type_str(struct pci_dev *dev) diff --git a/drivers/platform/surface/aggregator/ssh_packet_layer.c b/drive= rs/platform/surface/aggregator/ssh_packet_layer.c index 6081b0146d5f21be5b1876fcb224a92742e659a7..7d32d9ffea3728fc9be47b8c020= 104493f2d0af8 100644 --- a/drivers/platform/surface/aggregator/ssh_packet_layer.c +++ b/drivers/platform/surface/aggregator/ssh_packet_layer.c @@ -1066,7 +1066,7 @@ static int ssh_ptl_tx_packet(struct ssh_ptl *ptl, str= uct ssh_packet *packet) =20 ptl_dbg(ptl, "tx: sending data (length: %zu)\n", packet->data.len); print_hex_dump_debug("tx: ", DUMP_PREFIX_OFFSET, 16, 1, - packet->data.ptr, packet->data.len, false); + packet->data.ptr, packet->data.len, 0); =20 do { ssize_t status, len; @@ -1811,8 +1811,7 @@ static int ssh_ptl_rx_threadfn(void *data) =20 ptl_dbg(ptl, "rx: received data (size: %zu)\n", n); print_hex_dump_debug("rx: ", DUMP_PREFIX_OFFSET, 16, 1, - ptl->rx.buf.ptr + ptl->rx.buf.len - n, - n, false); + ptl->rx.buf.ptr + ptl->rx.buf.len - n, n, 0); =20 /* Parse until we need more bytes or buffer is empty. */ while (offs < ptl->rx.buf.len) { diff --git a/drivers/platform/x86/amd/pmf/tee-if.c b/drivers/platform/x86/a= md/pmf/tee-if.c index 8c88769ea1d87d4aaee3578c196bf67830f11999..a75b27fbc4c493d327d1585097c= 29a89d17632b9 100644 --- a/drivers/platform/x86/amd/pmf/tee-if.c +++ b/drivers/platform/x86/amd/pmf/tee-if.c @@ -333,7 +333,7 @@ static int amd_pmf_start_policy_engine(struct amd_pmf_d= ev *dev) static void amd_pmf_hex_dump_pb(struct amd_pmf_dev *dev) { print_hex_dump_debug("(pb): ", DUMP_PREFIX_OFFSET, 16, 1, dev->policy_bu= f, - dev->policy_sz, false); + dev->policy_sz, 0); } =20 static ssize_t amd_pmf_get_pb_data(struct file *filp, const char __user *b= uf, diff --git a/drivers/ras/amd/fmpm.c b/drivers/ras/amd/fmpm.c index 90de737fbc909780581068c82eff4ecfb291b7fb..82e94c54f49fae8daaa88135a37= b3df6f2976936 100644 --- a/drivers/ras/amd/fmpm.c +++ b/drivers/ras/amd/fmpm.c @@ -616,7 +616,7 @@ static bool fmp_is_valid(struct fru_rec *rec) checksum =3D do_fmp_checksum(fmp, len) + fmp->checksum; if (checksum) { pr_debug("fmp checksum failed: sum =3D 0x%x\n", checksum); - print_hex_dump_debug("fmp record: ", DUMP_PREFIX_NONE, 16, 1, fmp, len, = false); + print_hex_dump_debug("fmp record: ", DUMP_PREFIX_NONE, 16, 1, fmp, len, = 0); return false; } =20 diff --git a/drivers/rpmsg/rpmsg_ns.c b/drivers/rpmsg/rpmsg_ns.c index bde8c8d433e0aa68b1c9686f9d6d82df961fd30c..c3d70b93f6ce88cfce9f8c187ec= f5bb5ee445d9a 100644 --- a/drivers/rpmsg/rpmsg_ns.c +++ b/drivers/rpmsg/rpmsg_ns.c @@ -39,7 +39,7 @@ static int rpmsg_ns_cb(struct rpmsg_device *rpdev, void *= data, int len, =20 #if defined(CONFIG_DYNAMIC_DEBUG) dynamic_hex_dump("NS announcement: ", DUMP_PREFIX_NONE, 16, 1, - data, len, true); + data, len, DUMP_FLAG_ASCII); #endif =20 if (len !=3D sizeof(*msg)) { diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_= bus.c index 89d7a3b8c48b5f2fede667a6976b645700ebbedf..340308969718fd23c81e50dd7df= ae2367fd0b32a 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -622,7 +622,7 @@ static int rpmsg_send_offchannel_raw(struct rpmsg_devic= e *rpdev, src, dst, len, msg->flags, msg->reserved); #if defined(CONFIG_DYNAMIC_DEBUG) dynamic_hex_dump("rpmsg_virtio TX: ", DUMP_PREFIX_NONE, 16, 1, - msg, sizeof(*msg) + len, true); + msg, sizeof(*msg) + len, DUMP_FLAG_ASCII); #endif =20 rpmsg_sg_init(&sg, msg, sizeof(*msg) + len); @@ -722,7 +722,7 @@ static int rpmsg_recv_single(struct virtproc_info *vrp,= struct device *dev, __rpmsg32_to_cpu(little_endian, msg->reserved)); #if defined(CONFIG_DYNAMIC_DEBUG) dynamic_hex_dump("rpmsg_virtio RX: ", DUMP_PREFIX_NONE, 16, 1, - msg, sizeof(*msg) + msg_len, true); + msg, sizeof(*msg) + msg_len, DUMP_FLAG_ASCII); #endif =20 /* diff --git a/drivers/s390/crypto/ap_queue.c b/drivers/s390/crypto/ap_queue.c index 9a0e6e4d8a5e2aef03bf2d06e588c2c787a8b7bf..74e5cce3ee5369a36ee617b8e1c= fe359d0085052 100644 --- a/drivers/s390/crypto/ap_queue.c +++ b/drivers/s390/crypto/ap_queue.c @@ -142,7 +142,7 @@ static struct ap_queue_status ap_sm_recv(struct ap_queu= e *aq) switch (status.response_code) { case AP_RESPONSE_NORMAL: print_hex_dump_debug("aprpl: ", DUMP_PREFIX_ADDRESS, 16, 1, - aq->reply->msg, aq->reply->len, false); + aq->reply->msg, aq->reply->len, 0); aq->queue_count =3D max_t(int, 0, aq->queue_count - 1); if (!status.queue_empty && !aq->queue_count) aq->queue_count++; @@ -254,7 +254,7 @@ static enum ap_sm_wait ap_sm_write(struct ap_queue *aq) /* Start the next request on the queue. */ ap_msg =3D list_entry(aq->requestq.next, struct ap_message, list); print_hex_dump_debug("apreq: ", DUMP_PREFIX_ADDRESS, 16, 1, - ap_msg->msg, ap_msg->len, false); + ap_msg->msg, ap_msg->len, 0); status =3D __ap_send(qid, ap_msg->psmid, ap_msg->msg, ap_msg->len, ap_msg->flags & AP_MSG_FLAG_SPECIAL); diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_= api.c index 5020696f13797de76c8d5877bacef77d9e102d2c..0365e36937999b9b0adac2ae233= bf65c3f93c134 100644 --- a/drivers/s390/crypto/zcrypt_api.c +++ b/drivers/s390/crypto/zcrypt_api.c @@ -864,7 +864,7 @@ static long _zcrypt_send_cprb(bool userspace, struct ap= _perms *perms, if (rc) goto out; print_hex_dump_debug("ccareq: ", DUMP_PREFIX_ADDRESS, 16, 1, - ap_msg.msg, ap_msg.len, false); + ap_msg.msg, ap_msg.len, 0); =20 tdom =3D *domain; if (perms !=3D &ap_perms && tdom < AP_DOMAINS) { @@ -954,7 +954,7 @@ static long _zcrypt_send_cprb(bool userspace, struct ap= _perms *perms, rc =3D pref_zq->ops->send_cprb(userspace, pref_zq, xcrb, &ap_msg); if (!rc) { print_hex_dump_debug("ccarpl: ", DUMP_PREFIX_ADDRESS, 16, 1, - ap_msg.msg, ap_msg.len, false); + ap_msg.msg, ap_msg.len, 0); } =20 spin_lock(&zcrypt_list_lock); @@ -1069,7 +1069,7 @@ static long _zcrypt_send_ep11_cprb(bool userspace, st= ruct ap_perms *perms, if (rc) goto out_free; print_hex_dump_debug("ep11req: ", DUMP_PREFIX_ADDRESS, 16, 1, - ap_msg.msg, ap_msg.len, false); + ap_msg.msg, ap_msg.len, 0); =20 if (perms !=3D &ap_perms && domain < AUTOSEL_DOM) { if (ap_msg.flags & AP_MSG_FLAG_ADMIN) { @@ -1154,7 +1154,7 @@ static long _zcrypt_send_ep11_cprb(bool userspace, st= ruct ap_perms *perms, rc =3D pref_zq->ops->send_ep11_cprb(userspace, pref_zq, xcrb, &ap_msg); if (!rc) { print_hex_dump_debug("ep11rpl: ", DUMP_PREFIX_ADDRESS, 16, 1, - ap_msg.msg, ap_msg.len, false); + ap_msg.msg, ap_msg.len, 0); } =20 spin_lock(&zcrypt_list_lock); diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core= _main.c index a3adaec5504e45384eeedf8f82ee160317fcbbf5..a79e4ea39db3503ce45042b8cda= 92ee426f59e41 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -1125,7 +1125,7 @@ static int qeth_get_problem(struct qeth_card *card, s= truct ccw_device *cdev, QETH_DBF_MESSAGE(2, "check on channel %x with dstat=3D%#x, cstat=3D%#x\n= ", CCW_DEVID(cdev), dstat, cstat); print_hex_dump(KERN_WARNING, "qeth: irb ", DUMP_PREFIX_OFFSET, - 16, 1, irb, 64, 1); + 16, 1, irb, 64, DUMP_FLAG_ASCII); return -EIO; } =20 @@ -1276,9 +1276,11 @@ static void qeth_irq(struct ccw_device *cdev, unsign= ed long intparm, CCW_DEVID(channel->ccwdev), cstat, dstat); print_hex_dump(KERN_WARNING, "qeth: irb ", - DUMP_PREFIX_OFFSET, 16, 1, irb, 32, 1); + DUMP_PREFIX_OFFSET, 16, 1, irb, 32, + DUMP_FLAG_ASCII); print_hex_dump(KERN_WARNING, "qeth: sense data ", - DUMP_PREFIX_OFFSET, 16, 1, irb->ecw, 32, 1); + DUMP_PREFIX_OFFSET, 16, 1, irb->ecw, 32, + DUMP_FLAG_ASCII); } =20 rc =3D qeth_get_problem(card, cdev, irb); diff --git a/drivers/scsi/esas2r/esas2r_log.c b/drivers/scsi/esas2r/esas2r_= log.c index d6c87a0bae09822f6579667906f853dd07856b4d..68982f53c30d79208e4a77ec8e8= a11e3781ebbcb 100644 --- a/drivers/scsi/esas2r/esas2r_log.c +++ b/drivers/scsi/esas2r/esas2r_log.c @@ -245,7 +245,7 @@ int esas2r_log_hexdump(const long level, if (level <=3D event_log_level) { print_hex_dump(translate_esas2r_event_level_to_kernel(level), "", DUMP_PREFIX_OFFSET, 16, 1, buf, - len, true); + len, DUMP_FLAG_ASCII); } =20 return 1; diff --git a/drivers/scsi/qedf/qedf_fip.c b/drivers/scsi/qedf/qedf_fip.c index ad6a56ce72a86bd4ca45b3223c9eb8e7f839d235..e67c18da68d4fc8f59bb5e23ed7= e273bd1acfa1a 100644 --- a/drivers/scsi/qedf/qedf_fip.c +++ b/drivers/scsi/qedf/qedf_fip.c @@ -152,7 +152,7 @@ void qedf_fip_send(struct fcoe_ctlr *fip, struct sk_buf= f *skb) vlan_tci); if (qedf_dump_frames) print_hex_dump(KERN_WARNING, "fip ", DUMP_PREFIX_OFFSET, 16, 1, - skb->data, skb->len, false); + skb->data, skb->len, 0); =20 rc =3D qed_ops->ll2->start_xmit(qedf->cdev, skb, 0); if (rc) { @@ -194,7 +194,7 @@ void qedf_fip_recv(struct qedf_ctx *qedf, struct sk_buf= f *skb) sub, vlan); if (qedf_dump_frames) print_hex_dump(KERN_WARNING, "fip ", DUMP_PREFIX_OFFSET, 16, 1, - skb->data, skb->len, false); + skb->data, skb->len, 0); =20 if (!ether_addr_equal(eth_hdr->h_dest, qedf->mac) && !ether_addr_equal(eth_hdr->h_dest, fcoe_all_enode) && diff --git a/drivers/scsi/qedf/qedf_io.c b/drivers/scsi/qedf/qedf_io.c index fcfc3bed02c61466381332145cdc0d95acc37316..5c7f99ec59b06a9b380c9910901= cba042ed693c2 100644 --- a/drivers/scsi/qedf/qedf_io.c +++ b/drivers/scsi/qedf/qedf_io.c @@ -2526,7 +2526,7 @@ void qedf_process_unsol_compl(struct qedf_ctx *qedf, = uint16_t que_idx, QEDF_INFO(&(qedf->dbg_ctx), QEDF_LOG_UNSOL, "BDQ frame is at addr=3D%p.\n", bdq_addr); print_hex_dump(KERN_WARNING, "bdq ", DUMP_PREFIX_OFFSET, 16, 1, - (void *)bdq_addr, pktlen, false); + (void *)bdq_addr, pktlen, 0); } =20 /* Allocate frame */ diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c index d2f47dc31dbf9bf2e32753f74db5bbb2e584e908..306e3d5ca05bfd86369d3e54033= 85fe985f6fb9e 100644 --- a/drivers/scsi/qedf/qedf_main.c +++ b/drivers/scsi/qedf/qedf_main.c @@ -1240,7 +1240,7 @@ static int qedf_xmit(struct fc_lport *lport, struct f= c_frame *fp) vlan_tci); if (qedf_dump_frames) print_hex_dump(KERN_WARNING, "fcoe: ", DUMP_PREFIX_OFFSET, 16, - 1, skb->data, skb->len, false); + 1, skb->data, skb->len, 0); rc =3D qed_ops->ll2->start_xmit(qedf->cdev, skb, 0); if (rc) { QEDF_ERR(&qedf->dbg_ctx, "start_xmit failed rc =3D %d.\n", rc); @@ -2612,7 +2612,7 @@ static void qedf_recv_frame(struct qedf_ctx *qedf, fh->fh_type); if (qedf_dump_frames) print_hex_dump(KERN_WARNING, "fcoe: ", DUMP_PREFIX_OFFSET, 16, - 1, skb->data, skb->len, false); + 1, skb->data, skb->len, 0); fc_exch_recv(lport, fp); } =20 diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index 691ef827a5ab3eb467bfced7dad33fa08dce0b29..36e902309ef5807da4955178a26= ce7e3ceee8874 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c @@ -2701,7 +2701,7 @@ ql_dump_buffer(uint level, scsi_qla_host_t *vha, uint= id, const void *buf, for (cnt =3D 0; cnt < size; cnt +=3D 16) { ql_dbg(level, vha, id, "%04x: ", cnt); print_hex_dump(KERN_CONT, "", DUMP_PREFIX_NONE, 16, 1, - buf + cnt, min(16U, size - cnt), false); + buf + cnt, min(16U, size - cnt), 0); } } =20 diff --git a/drivers/soc/ti/k3-ringacc.c b/drivers/soc/ti/k3-ringacc.c index 82a15cad1c6c43775de0a778b4caf8e79e04bbca..8ddac059bfe024ae06bc0296c22= 154d6bbbcbaa9 100644 --- a/drivers/soc/ti/k3-ringacc.c +++ b/drivers/soc/ti/k3-ringacc.c @@ -326,7 +326,7 @@ static void k3_ringacc_ring_dump(struct k3_ring *ring) =20 if (ring->ring_mem_virt) print_hex_dump_debug("dump ring_mem_virt ", DUMP_PREFIX_NONE, - 16, 1, ring->ring_mem_virt, 16 * 8, false); + 16, 1, ring->ring_mem_virt, 16 * 8, 0); } =20 struct k3_ring *k3_ringacc_request_ring(struct k3_ringacc *ringacc, diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index dd87cf4f70dd5678f348d2e16e933e8707ce3923..baa64de866d3d1cf4332e44ab7e= 4bc3a1cb713c0 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -715,23 +715,13 @@ static void dma_callback(void *data) =20 for_each_sg(pl022->sgt_rx.sgl, sg, pl022->sgt_rx.nents, i) { dev_dbg(&pl022->adev->dev, "SPI RX SG ENTRY: %d", i); - print_hex_dump(KERN_ERR, "SPI RX: ", - DUMP_PREFIX_OFFSET, - 16, - 1, - sg_virt(sg), - sg_dma_len(sg), - 1); + print_hex_dump(KERN_ERR, "SPI RX: ", DUMP_PREFIX_OFFSET, 16, 1, + sg_virt(sg), sg_dma_len(sg), DUMP_FLAG_ASCII); } for_each_sg(pl022->sgt_tx.sgl, sg, pl022->sgt_tx.nents, i) { dev_dbg(&pl022->adev->dev, "SPI TX SG ENTRY: %d", i); - print_hex_dump(KERN_ERR, "SPI TX: ", - DUMP_PREFIX_OFFSET, - 16, - 1, - sg_virt(sg), - sg_dma_len(sg), - 1); + print_hex_dump(KERN_ERR, "SPI TX: ", DUMP_PREFIX_OFFSET, 16, 1, + sg_virt(sg), sg_dma_len(sg), DUMP_FLAG_ASCII); } } #endif diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c b/drivers= /staging/gpib/agilent_82357a/agilent_82357a.c index bf05fb4a736b3f4b7f9b12e3cac4d1b53a6cd49c..66864ab1c47d0acf6465fd2d33a= 7f87bbdd8cfa9 100644 --- a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c +++ b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c @@ -206,7 +206,7 @@ static int agilent_82357a_receive_control_msg(struct ag= ilent_82357a_priv *a_priv static void agilent_82357a_dump_raw_block(const u8 *raw_data, int length) { pr_info("hex block dump\n"); - print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE, 8, 1, raw_data, length, t= rue); + print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE, 8, 1, raw_data, length, D= UMP_FLAG_ASCII); } =20 static int agilent_82357a_write_registers(struct agilent_82357a_priv *a_pr= iv, diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/staging/gp= ib/ni_usb/ni_usb_gpib.c index b7b6fb1be379032b894e2b0cb7d0325c83bf4b07..101cbe051d2d275a3c853cd4c22= ac966271b5e10 100644 --- a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c +++ b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c @@ -356,7 +356,7 @@ static int ni_usb_parse_status_block(const u8 *buffer, = struct ni_usb_status_bloc =20 static void ni_usb_dump_raw_block(const u8 *raw_data, int length) { - print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE, 8, 1, raw_data, length, t= rue); + print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE, 8, 1, raw_data, length, D= UMP_FLAG_ASCII); } =20 static int ni_usb_parse_register_read_block(const u8 *raw_data, unsigned i= nt *results, diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index 263774e6a78cae913ebd74af5d16ed0dc6ee86ad..84acb363393523427ee971013c9= b05ecec60e67a 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -144,7 +144,7 @@ static int nvec_status_notifier(struct notifier_block *= nb, =20 dev_warn(nvec->dev, "unhandled msg type %ld\n", event_type); print_hex_dump(KERN_WARNING, "payload: ", DUMP_PREFIX_NONE, 16, 1, - msg, msg[1] + 2, true); + msg, msg[1] + 2, DUMP_FLAG_ASCII); =20 return NOTIFY_OK; } @@ -425,7 +425,7 @@ static int parse_msg(struct nvec_chip *nvec, struct nve= c_msg *msg) if ((msg->data[0] >> 7) =3D=3D 1 && (msg->data[0] & 0x0f) =3D=3D 5) print_hex_dump(KERN_WARNING, "ec system event ", DUMP_PREFIX_NONE, 16, 1, msg->data, - msg->data[1] + 2, true); + msg->data[1] + 2, DUMP_FLAG_ASCII); =20 atomic_notifier_call_chain(&nvec->notifier_list, msg->data[0] & 0x8f, msg->data); diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps= 2.c index 575233fa1677eaab75b28448f3a15f9839527b12..0ceb761b446587588015b0c521b= fc3e7f75d43ad 100644 --- a/drivers/staging/nvec/nvec_ps2.c +++ b/drivers/staging/nvec/nvec_ps2.c @@ -26,7 +26,7 @@ #ifdef NVEC_PS2_DEBUG #define NVEC_PHD(str, buf, len) \ print_hex_dump(KERN_DEBUG, str, DUMP_PREFIX_NONE, \ - 16, 1, buf, len, false) + 16, 1, buf, len, 0) #else #define NVEC_PHD(str, buf, len) do { } while (0) #endif diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/driver= s/staging/vc04_services/vchiq-mmal/mmal-vchiq.c index 3fe482bd279390a7586c49bde00f38c61558ca8e..8bc09401c95695f6a9b00f6b4c4= 71c0390e9a568 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -96,11 +96,11 @@ static const char *const port_action_type_names[] =3D { (MSG)->h.type, (MSG_LEN)); \ print_hex_dump(KERN_DEBUG, "< 4 ? DUMP_PREFIX_OFFSET : DUMP_PREFIX_NONE,\ - 16, 4, buf, __len, false); \ + 16, 4, buf, __len, 0); \ } while (0) =20 int ufshcd_dump_regs(struct ufs_hba *hba, size_t offset, size_t len, diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 34e46ef308abfd09663f3121808277614db60505..05ba4da868beb6ae900e6ff45ed= 16d0e0d10324e 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c @@ -329,7 +329,7 @@ static int usbtmc_ioctl_abort_bulk_in_tag(struct usbtmc= _device_data *data, &actual, 300); =20 print_hex_dump_debug("usbtmc ", DUMP_PREFIX_NONE, 16, 1, - buffer, actual, true); + buffer, actual, DUMP_FLAG_ASCII); =20 n++; =20 @@ -985,7 +985,7 @@ static ssize_t usbtmc_generic_read(struct usbtmc_file_d= ata *file_data, this_part =3D remaining; =20 print_hex_dump_debug("usbtmc ", DUMP_PREFIX_NONE, 16, 1, - urb->transfer_buffer, urb->actual_length, true); + urb->transfer_buffer, urb->actual_length, DUMP_FLAG_ASCII); =20 if (copy_to_user(user_buffer + done, urb->transfer_buffer, this_part)) { @@ -1193,7 +1193,7 @@ static ssize_t usbtmc_generic_write(struct usbtmc_fil= e_data *file_data, } =20 print_hex_dump_debug("usbtmc ", DUMP_PREFIX_NONE, - 16, 1, buffer, this_part, true); + 16, 1, buffer, this_part, DUMP_FLAG_ASCII); =20 /* fill bulk with 32 bit alignment to meet USBTMC specification * (size + 3 & ~3) rounds up and simplifies user code @@ -1467,7 +1467,7 @@ static ssize_t usbtmc_read(struct file *filp, char __= user *buf, } =20 print_hex_dump_debug("usbtmc ", DUMP_PREFIX_NONE, - 16, 1, buffer, actual, true); + 16, 1, buffer, actual, DUMP_FLAG_ASCII); =20 remaining =3D n_characters; =20 @@ -1595,7 +1595,7 @@ static ssize_t usbtmc_write(struct file *filp, const = char __user *buf, (unsigned int)transfersize, (unsigned int)aligned); =20 print_hex_dump_debug("usbtmc ", DUMP_PREFIX_NONE, - 16, 1, buffer, aligned, true); + 16, 1, buffer, aligned, DUMP_FLAG_ASCII); =20 usb_fill_bulk_urb(urb, data->usb_dev, usb_sndbulkpipe(data->usb_dev, data->bulk_out), @@ -1718,7 +1718,7 @@ static int usbtmc_ioctl_clear(struct usbtmc_device_da= ta *data) &actual, USB_CTRL_GET_TIMEOUT); =20 print_hex_dump_debug("usbtmc ", DUMP_PREFIX_NONE, - 16, 1, buffer, actual, true); + 16, 1, buffer, actual, DUMP_FLAG_ASCII); =20 n++; =20 diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index f6ce6e26e0d45f67704f40b27c5a09cde9111259..3171591b5e3ecdfc7c098f6f762= 3b07312f04f71 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c @@ -527,7 +527,7 @@ static void snoop_urb(struct usb_device *udev, data_len =3D min(data_len, usbfs_snoop_max); if (data && data_len > 0) { print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_NONE, 32, 1, - data, data_len, 1); + data, data_len, DUMP_FLAG_ASCII); } } =20 @@ -541,14 +541,14 @@ static void snoop_urb_data(struct urb *urb, unsigned = len) =20 if (urb->num_sgs =3D=3D 0) { print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_NONE, 32, 1, - urb->transfer_buffer, len, 1); + urb->transfer_buffer, len, DUMP_FLAG_ASCII); return; } =20 for (i =3D 0; i < urb->num_sgs && len; i++) { size =3D (len > USB_SG_SIZE) ? USB_SG_SIZE : len; print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_NONE, 32, 1, - sg_virt(&urb->sg[i]), size, 1); + sg_virt(&urb->sg[i]), size, DUMP_FLAG_ASCII); len -=3D size; } } diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/funct= ion/f_ncm.c index 8e761249d672c7b079f2c9ec13cbe9644251ec94..ed63b8691fa4db2339f5079a02c= 7a7364f75460a 100644 --- a/drivers/usb/gadget/function/f_ncm.c +++ b/drivers/usb/gadget/function/f_ncm.c @@ -1193,7 +1193,7 @@ static int ncm_unwrap_ntb(struct gether *port, INFO(port->func.config->cdev, "Wrong NTH SIGN, skblen %d\n", skb->len); print_hex_dump(KERN_INFO, "HEAD:", DUMP_PREFIX_ADDRESS, 32, 1, - skb->data, 32, false); + skb->data, 32, 0); =20 goto err; } diff --git a/drivers/usb/gadget/udc/gr_udc.c b/drivers/usb/gadget/udc/gr_ud= c.c index bf5b3c964c18702e765309584bb32a9c2be7ebdb..04163c23ed9af3589655af567dc= 9e61e6a6a5c2e 100644 --- a/drivers/usb/gadget/udc/gr_udc.c +++ b/drivers/usb/gadget/udc/gr_udc.c @@ -97,7 +97,7 @@ static void gr_dbgprint_request(const char *str, struct g= r_ep *ep, dev_dbg(ep->dev->dev, "%s: 0x%p, %d bytes data%s:\n", str, req, buflen, (buflen > plen ? " (truncated)" : "")); print_hex_dump_debug(" ", DUMP_PREFIX_NONE, - rowlen, 4, req->req.buf, plen, false); + rowlen, 4, req->req.buf, plen, 0); } =20 static void gr_dbgprint_devreq(struct gr_udc *dev, u8 type, u8 request, diff --git a/drivers/usb/usbip/usbip_common.c b/drivers/usb/usbip/usbip_com= mon.c index a2b2da1255dda0c1b282171ead393dc9ac0a9c68..e0639b410cccc6239145ebe0ddd= 81d3ceee4512e 100644 --- a/drivers/usb/usbip/usbip_common.c +++ b/drivers/usb/usbip/usbip_common.c @@ -52,7 +52,7 @@ DEVICE_ATTR_RW(usbip_debug); static void usbip_dump_buffer(char *buff, int bufflen) { print_hex_dump(KERN_DEBUG, "usbip-core", DUMP_PREFIX_OFFSET, 16, 4, - buff, bufflen, false); + buff, bufflen, 0); } =20 static void usbip_dump_pipe(unsigned int p) diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c b/drivers/vi= deo/fbdev/omap2/omapfb/dss/hdmi4_core.c index e6363a4209338014a78608436c9177f3d173c09e..c375fd145d684190b51388d1182= bdbad518b9bac 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c @@ -269,7 +269,7 @@ static void hdmi_core_write_avi_infoframe(struct hdmi_c= ore_data *core, hdmi_avi_infoframe_pack(frame, data, sizeof(data)); =20 print_hex_dump_debug("AVI: ", DUMP_PREFIX_NONE, 16, 1, data, - HDMI_INFOFRAME_SIZE(AVI), false); + HDMI_INFOFRAME_SIZE(AVI), 0); =20 for (i =3D 0; i < sizeof(data); ++i) { hdmi_write_reg(av_base, HDMI_CORE_AV_AVI_BASE + i * 4, diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c b/drivers/vi= deo/fbdev/omap2/omapfb/dss/hdmi5_core.c index b33f62c5cb220b5433302c70d76717ffb6baf78f..e89cf35f65780b8eefc5458668d= e7310f9aacc02 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c @@ -418,7 +418,7 @@ static void hdmi_core_write_avi_infoframe(struct hdmi_c= ore_data *core, hdmi_avi_infoframe_pack(frame, data, sizeof(data)); =20 print_hex_dump_debug("AVI: ", DUMP_PREFIX_NONE, 16, 1, data, - HDMI_INFOFRAME_SIZE(AVI), false); + HDMI_INFOFRAME_SIZE(AVI), 0); =20 ptr =3D data + HDMI_INFOFRAME_HEADER_SIZE; =20 diff --git a/drivers/watchdog/wdrtas.c b/drivers/watchdog/wdrtas.c index d4fe0bc822116974110268f601c99cd2042aa73c..4df04c66ed883c3738e42f4f4cf= 8fd33b4a806d5 100644 --- a/drivers/watchdog/wdrtas.c +++ b/drivers/watchdog/wdrtas.c @@ -167,7 +167,7 @@ static void wdrtas_timer_keepalive(void) if (result =3D=3D 0) print_hex_dump(KERN_INFO, "dumping event, data: ", DUMP_PREFIX_OFFSET, 16, 1, - wdrtas_logbuffer, WDRTAS_LOGBUFFER_LEN, false); + wdrtas_logbuffer, WDRTAS_LOGBUFFER_LEN, 0); } while (result =3D=3D 0); } =20 diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c index 8109aba66e023eb0d3dd5cdf06f3060c5cbf4b1a..60f102df478567a1552169a8712= d510869d404ae 100644 --- a/fs/ceph/mdsmap.c +++ b/fs/ceph/mdsmap.c @@ -399,7 +399,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(struct ceph_mds_= client *mdsc, void **p, pr_err_client(cl, "corrupt mdsmap\n"); print_hex_dump(KERN_DEBUG, "mdsmap: ", DUMP_PREFIX_OFFSET, 16, 1, - start, end - start, true); + start, end - start, DUMP_FLAG_ASCII); out_err: ceph_mdsmap_destroy(m); return ERR_PTR(err); diff --git a/fs/ecryptfs/debug.c b/fs/ecryptfs/debug.c index cf6d0e8e25a16245e1600bc85e3fd31ed5979c7e..821d70a2e09d1786c0a6303357b= f2df498444e78 100644 --- a/fs/ecryptfs/debug.c +++ b/fs/ecryptfs/debug.c @@ -87,5 +87,5 @@ void ecryptfs_dump_hex(char *data, int bytes) return; =20 print_hex_dump(KERN_DEBUG, "ecryptfs: ", DUMP_PREFIX_OFFSET, 16, 1, - data, bytes, false); + data, bytes, 0); } diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 785809f33ff4a9bda0dcf3f03092fb7816c5b49d..b34de4fb49259b6fe1b895a8c61= 2b1d03b01f9e9 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1463,8 +1463,7 @@ static void ext4_destroy_inode(struct inode *inode) "Inode %lu (%p): orphan list check failed!", inode->i_ino, EXT4_I(inode)); print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS, 16, 4, - EXT4_I(inode), sizeof(struct ext4_inode_info), - true); + EXT4_I(inode), sizeof(struct ext4_inode_info), DUMP_FLAG_ASCII); dump_stack(); } =20 diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c index 24afbae87225a770e4701ce9f408bd7c87de18d8..2e32d0597714e4a0bef57053d78= 1ceb364b97a00 100644 --- a/fs/jfs/xattr.c +++ b/fs/jfs/xattr.c @@ -563,7 +563,7 @@ static int ea_get(struct inode *inode, struct ea_buffer= *ea_buf, int min_size) =20 printk(KERN_ERR "ea_get: invalid extended attribute\n"); print_hex_dump(KERN_ERR, "", DUMP_PREFIX_ADDRESS, 16, 1, - ea_buf->xattr, size, 1); + ea_buf->xattr, size, DUMP_FLAG_ASCII); ea_release(inode, ea_buf); rc =3D -EIO; goto clean_up; diff --git a/fs/seq_file.c b/fs/seq_file.c index 8bbb1ad46335c3b8f50dd35d552f86767e62ead1..ccfc8ba089bd64db6f6485b1f01= d0dc155eeb880 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -885,7 +885,7 @@ void seq_hex_dump(struct seq_file *m, const char *prefi= x_str, int prefix_type, =20 size =3D seq_get_buf(m, &buffer); ret =3D hex_dump_to_buffer(ptr + i, linelen, rowsize, groupsize, - buffer, size, ascii); + buffer, size, ascii ? DUMP_FLAG_ASCII : 0); seq_commit(m, ret < size ? ret : -1); =20 seq_putc(m, '\n'); diff --git a/fs/smb/client/cifs_debug.c b/fs/smb/client/cifs_debug.c index e03c890de0a0682d3d786d8aa5b44ade346b929d..a82b86bad3c99440b2a1ccdcbe6= d56e3017c4c3d 100644 --- a/fs/smb/client/cifs_debug.c +++ b/fs/smb/client/cifs_debug.c @@ -32,7 +32,7 @@ cifs_dump_mem(char *label, void *data, int length) { pr_debug("%s: dump of %d bytes of data at 0x%p\n", label, length, data); print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 4, - data, length, true); + data, length, DUMP_FLAG_ASCII); } =20 void cifs_dump_detail(void *buf, struct TCP_Server_Info *server) diff --git a/fs/smb/client/misc.c b/fs/smb/client/misc.c index 4373dd64b66d4f2f704dce56b889f2c9cc86880e..23f5120264ca8a55072cdd81644= d1fd5e1b83daf 100644 --- a/fs/smb/client/misc.c +++ b/fs/smb/client/misc.c @@ -537,7 +537,7 @@ dump_smb(void *buf, int smb_buf_length) return; =20 print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_NONE, 8, 2, buf, - smb_buf_length, true); + smb_buf_length, DUMP_FLAG_ASCII); } =20 void diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 5cc69beaa62ecfb6f0899a293eea523fa7a75b13..607c5c4508685135848f7107074= 97137f67e165d 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@ -302,7 +302,7 @@ void ubifs_dump_node(const struct ubifs_info *c, const = void *node, int node_len) if (le32_to_cpu(ch->magic) !=3D UBIFS_NODE_MAGIC) { pr_err("Not a node, first %zu bytes:", UBIFS_CH_SZ); print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 32, 1, - (void *)node, UBIFS_CH_SZ, 1); + (void *)node, UBIFS_CH_SZ, DUMP_FLAG_ASCII); return; } =20 diff --git a/fs/ubifs/scan.c b/fs/ubifs/scan.c index 84a9157dcc32ca2b8df1bbe14cd3eb8dd051da36..bd42a4ca23e7832058abcca375c= aeed8afc6e01f 100644 --- a/fs/ubifs/scan.c +++ b/fs/ubifs/scan.c @@ -232,7 +232,7 @@ void ubifs_scanned_corruption(const struct ubifs_info *= c, int lnum, int offs, if (len > 8192) len =3D 8192; ubifs_err(c, "first %d bytes from LEB %d:%d", len, lnum, offs); - print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 4, buf, len, 1); + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 4, buf, len, DUMP_= FLAG_ASCII); } =20 /** diff --git a/fs/xfs/xfs_message.c b/fs/xfs/xfs_message.c index 6ed485ff27568c59fbe313c321a0c8fccf22703c..b95fd2da277a02c6c52e0930da9= d8cc860e95673 100644 --- a/fs/xfs/xfs_message.c +++ b/fs/xfs/xfs_message.c @@ -107,7 +107,7 @@ assfail( void xfs_hex_dump(const void *p, int length) { - print_hex_dump(KERN_ALERT, "", DUMP_PREFIX_OFFSET, 16, 1, p, length, 1); + print_hex_dump(KERN_ALERT, "", DUMP_PREFIX_OFFSET, 16, 1, p, length, DUMP= _FLAG_ASCII); } =20 void diff --git a/include/linux/dma/ti-cppi5.h b/include/linux/dma/ti-cppi5.h index c53c0f6e3b1a6029cfd6864c06f9effbcd35ff08..d1080f06692450b97ebd09a8a5e= 8b418922bf4a3 100644 --- a/include/linux/dma/ti-cppi5.h +++ b/include/linux/dma/ti-cppi5.h @@ -171,7 +171,7 @@ struct cppi5_monolithic_desc_t { static inline void cppi5_desc_dump(void *desc, u32 size) { print_hex_dump(KERN_ERR, "dump udmap_desc: ", DUMP_PREFIX_NONE, - 32, 4, desc, size, false); + 32, 4, desc, size, 0); } =20 #define CPPI5_TDCM_MARKER (0x1) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index ff44ec346162a164cbaf42c7df6f3894505d0654..c44bab3afa6380e30e25c88b7a1= 105bdbe05d65c 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -282,11 +282,11 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, dev, fmt, ##__VA_ARGS__) =20 #define dynamic_hex_dump(prefix_str, prefix_type, rowsize, \ - groupsize, buf, len, ascii) \ + groupsize, buf, len, flags) \ _dynamic_func_call_no_desc(__builtin_constant_p(prefix_str) ? prefix_str = : "hexdump", \ print_hex_dump, \ KERN_DEBUG, prefix_str, prefix_type, \ - rowsize, groupsize, buf, len, ascii) + rowsize, groupsize, buf, len, flags) =20 /* for test only, generally expect drm.debug style macro wrappers */ #define __pr_debug_cls(cls, fmt, ...) do { \ @@ -309,10 +309,10 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, #define dynamic_dev_dbg(dev, fmt, ...) \ dev_no_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__) #define dynamic_hex_dump(prefix_str, prefix_type, rowsize, \ - groupsize, buf, len, ascii) \ + groupsize, buf, len, flags) \ do { if (0) \ print_hex_dump(KERN_DEBUG, prefix_str, prefix_type, \ - rowsize, groupsize, buf, len, ascii); \ + rowsize, groupsize, buf, len, flags); \ } while (0) =20 #endif /* CONFIG_DYNAMIC_DEBUG || (CONFIG_DYNAMIC_DEBUG_CORE && DYNAMIC_DE= BUG_MODULE) */ diff --git a/include/linux/filter.h b/include/linux/filter.h index 3a21947f2fd441b6e91a80eae121d5b37cf3c68b..4b4df853dfedd2f8d34546aee9e= 9bd6c49ca6094 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -1268,7 +1268,7 @@ static inline void bpf_jit_dump(unsigned int flen, un= signed int proglen, =20 if (image) print_hex_dump(KERN_ERR, "JIT code: ", DUMP_PREFIX_OFFSET, - 16, 1, image, proglen, false); + 16, 1, image, proglen, 0); } =20 static inline bool bpf_jit_is_ebpf(void) diff --git a/include/linux/mlx5/cq.h b/include/linux/mlx5/cq.h index 991526039ccbd6fa2009dafea8c355b0f45abf20..304333e0a2e97b1b26888a87bed= ae342ba0e6b2d 100644 --- a/include/linux/mlx5/cq.h +++ b/include/linux/mlx5/cq.h @@ -200,7 +200,7 @@ static inline void mlx5_dump_err_cqe(struct mlx5_core_d= ev *dev, struct mlx5_err_cqe *err_cqe) { print_hex_dump(KERN_WARNING, "", DUMP_PREFIX_OFFSET, 16, 1, err_cqe, - sizeof(*err_cqe), false); + sizeof(*err_cqe), 0); } int mlx5_debug_cq_add(struct mlx5_core_dev *dev, struct mlx5_core_cq *cq); void mlx5_debug_cq_remove(struct mlx5_core_dev *dev, struct mlx5_core_cq *= cq); diff --git a/include/linux/printk.h b/include/linux/printk.h index 4217a9f412b265f1dc027be88eff7f5a0e0e4aab..59e9e4c445108d66a3df422cfea= f79920e2ff08f 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -752,17 +752,24 @@ enum { DUMP_PREFIX_ADDRESS, DUMP_PREFIX_OFFSET }; + +enum { + DUMP_FLAG_ASCII, +}; + extern int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, int groupsize, char *linebuf, size_t linebuflen, bool ascii); #ifdef CONFIG_PRINTK extern void print_hex_dump(const char *level, const char *prefix_str, int prefix_type, int rowsize, int groupsize, - const void *buf, size_t len, bool ascii); + const void *buf, size_t len, + unsigned int flags); #else static inline void print_hex_dump(const char *level, const char *prefix_st= r, int prefix_type, int rowsize, int groupsize, - const void *buf, size_t len, bool ascii) + const void *buf, size_t len, + unsigned int flags) { } static inline void print_hex_dump_bytes(const char *prefix_str, int prefix= _type, @@ -775,18 +782,19 @@ static inline void print_hex_dump_bytes(const char *p= refix_str, int prefix_type, #if defined(CONFIG_DYNAMIC_DEBUG) || \ (defined(CONFIG_DYNAMIC_DEBUG_CORE) && defined(DYNAMIC_DEBUG_MODULE)) #define print_hex_dump_debug(prefix_str, prefix_type, rowsize, \ - groupsize, buf, len, ascii) \ + groupsize, buf, len, flags) \ dynamic_hex_dump(prefix_str, prefix_type, rowsize, \ - groupsize, buf, len, ascii) + groupsize, buf, len, flags) #elif defined(DEBUG) #define print_hex_dump_debug(prefix_str, prefix_type, rowsize, \ - groupsize, buf, len, ascii) \ + groupsize, buf, len, flags) \ print_hex_dump(KERN_DEBUG, prefix_str, prefix_type, rowsize, \ - groupsize, buf, len, ascii) + groupsize, buf, len, flags) #else static inline void print_hex_dump_debug(const char *prefix_str, int prefix= _type, int rowsize, int groupsize, - const void *buf, size_t len, bool ascii) + const void *buf, size_t len, + unsigned int flags) { } #endif diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h index c80539be15426c7f8afbefdb7caa3b6e435d553d..427cb3f800a36e9c4f332d97af6= 50506f3f38add 100644 --- a/include/net/6lowpan.h +++ b/include/net/6lowpan.h @@ -221,7 +221,7 @@ static inline void raw_dump_inline(const char *caller, = char *msg, if (msg) pr_debug("%s():%s: ", caller, msg); =20 - print_hex_dump_debug("", DUMP_PREFIX_NONE, 16, 1, buf, len, false); + print_hex_dump_debug("", DUMP_PREFIX_NONE, 16, 1, buf, len, 0); } =20 /* print data in a table format: @@ -236,7 +236,7 @@ static inline void raw_dump_table(const char *caller, c= har *msg, if (msg) pr_debug("%s():%s:\n", caller, msg); =20 - print_hex_dump_debug("\t", DUMP_PREFIX_OFFSET, 16, 1, buf, len, false); + print_hex_dump_debug("\t", DUMP_PREFIX_OFFSET, 16, 1, buf, len, 0); } #else static inline void raw_dump_table(const char *caller, char *msg, diff --git a/lib/hexdump.c b/lib/hexdump.c index c3db7c3a764365b01e78f8ed0b7f782f33a5ce34..4ac9c32c28a046d2ca037eaef95= c785c1a866627 100644 --- a/lib/hexdump.c +++ b/lib/hexdump.c @@ -238,7 +238,8 @@ EXPORT_SYMBOL(hex_dump_to_buffer); * @groupsize: number of bytes to print at a time (1, 2, 4, 8; default =3D= 1) * @buf: data blob to dump * @len: number of bytes in the @buf - * @ascii: include ASCII after the hex output + * @flags: controls the output, typically %DUMP_FLAG_ASCII will print the = ascii + * equivalent after the hex output. * * Given a buffer of u8 data, print_hex_dump() prints a hex + ASCII dump * to the kernel log at the specified kernel log level, with an optional @@ -251,7 +252,7 @@ EXPORT_SYMBOL(hex_dump_to_buffer); * * E.g.: * print_hex_dump(KERN_DEBUG, "raw data: ", DUMP_PREFIX_ADDRESS, - * 16, 1, frame->data, frame->len, true); + * 16, 1, frame->data, frame->len, DUMP_FLAG_ASCII); * * Example output using %DUMP_PREFIX_OFFSET and 1-byte mode: * 0009ab42: 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f @ABCDEFGHIJK= LMNO @@ -260,7 +261,7 @@ EXPORT_SYMBOL(hex_dump_to_buffer); */ void print_hex_dump(const char *level, const char *prefix_str, int prefix_= type, int rowsize, int groupsize, - const void *buf, size_t len, bool ascii) + const void *buf, size_t len, unsigned int flags) { const u8 *ptr =3D buf; int i, linelen, remaining =3D len; @@ -274,7 +275,8 @@ void print_hex_dump(const char *level, const char *pref= ix_str, int prefix_type, remaining -=3D rowsize; =20 hex_dump_to_buffer(ptr + i, linelen, rowsize, groupsize, - linebuf, sizeof(linebuf), ascii); + linebuf, sizeof(linebuf), + flags & DUMP_FLAG_ASCII); =20 switch (prefix_type) { case DUMP_PREFIX_ADDRESS: diff --git a/lib/test_bitmap.c b/lib/test_bitmap.c index 65a75d58ed9e468f856801f02488caaa91240dae..8414c1a1b2ae7be88860b169844= 9eacbf0833948 100644 --- a/lib/test_bitmap.c +++ b/lib/test_bitmap.c @@ -119,9 +119,9 @@ __check_eq_u32_array(const char *srcfile, unsigned int = line, if (memcmp(exp_arr, arr, len*sizeof(*arr))) { pr_warn("[%s:%u] array contents differ\n", srcfile, line); print_hex_dump(KERN_WARNING, " exp: ", DUMP_PREFIX_OFFSET, - 32, 4, exp_arr, exp_len*sizeof(*exp_arr), false); + 32, 4, exp_arr, exp_len*sizeof(*exp_arr), 0); print_hex_dump(KERN_WARNING, " got: ", DUMP_PREFIX_OFFSET, - 32, 4, arr, len*sizeof(*arr), false); + 32, 4, arr, len*sizeof(*arr), 0); return false; } =20 diff --git a/mm/debug.c b/mm/debug.c index aa57d3ffd4edf6d8d8834f63c1a13f40f5287b89..b2ab39f5fc6da81f95cab63f3bf= 39d7a42982210 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -113,11 +113,11 @@ static void __dump_folio(struct folio *folio, struct = page *page, =20 print_hex_dump(KERN_WARNING, "raw: ", DUMP_PREFIX_NONE, 32, sizeof(unsigned long), page, - sizeof(struct page), false); + sizeof(struct page), 0); if (folio_test_large(folio)) print_hex_dump(KERN_WARNING, "head: ", DUMP_PREFIX_NONE, 32, sizeof(unsigned long), folio, - 2 * sizeof(struct page), false); + 2 * sizeof(struct page), 0); } =20 static void __dump_page(const struct page *page) diff --git a/mm/dmapool.c b/mm/dmapool.c index f0bfc6c490f4e1cf4a148573314c1edd7b8fb813..d4d62d3f47a38f73619f956eefd= 4f3a48a5d2eb3 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -109,7 +109,7 @@ static void pool_check_block(struct dma_pool *pool, str= uct dma_block *block, * POOL_POISON_FREED */ print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, - data, pool->size, 1); + data, pool->size, DUMP_FLAG_ASCII); break; } =20 diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 2a945c07ae99525815c8fb733e8eb1b4da60668e..302c80adb7dc5f381b6f7b66d48= 12add0b3053e5 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -283,7 +283,7 @@ static void warn_or_seq_hex_dump(struct seq_file *seq, = int prefix_type, buf, len, ascii); else print_hex_dump(KERN_WARNING, pr_fmt(HEX_PREFIX), prefix_type, - rowsize, groupsize, buf, len, ascii); + rowsize, groupsize, buf, len, DUMP_FLAG_ASCII); } =20 /* diff --git a/mm/page_poison.c b/mm/page_poison.c index 3e9037363cf9d85e6afafc229da8da7a8c754e70..7910c3209123c7a3747c8620d53= 61554424202d8 100644 --- a/mm/page_poison.c +++ b/mm/page_poison.c @@ -68,7 +68,7 @@ static void check_poison_mem(struct page *page, unsigned = char *mem, size_t bytes pr_err("pagealloc: memory corruption\n"); =20 print_hex_dump(KERN_ERR, "", DUMP_PREFIX_ADDRESS, 16, 1, start, - end - start + 1, 1); + end - start + 1, DUMP_FLAG_ASCII); dump_stack(); dump_page(page, "pagealloc: corrupted page details"); } diff --git a/mm/slub.c b/mm/slub.c index 19980419b176c28d2e6247f8b076c0a83b65a436..c3cbe4cf0ff640fa7c18d611d11= ab9cc5ea51268 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -910,7 +910,7 @@ static void print_section(char *level, char *text, u8 *= addr, { metadata_access_enable(); print_hex_dump(level, text, DUMP_PREFIX_ADDRESS, - 16, 1, kasan_reset_tag((void *)addr), length, 1); + 16, 1, kasan_reset_tag((void *)addr), length, DUMP_FLAG_ASCII); metadata_access_disable(); } =20 diff --git a/net/atm/br2684.c b/net/atm/br2684.c index f666f2f98ba5096a4a422fcd70dd7a44f2baa5e3..56c1a73235e477b8c91846cb0f0= 53c147e2a1e9c 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c @@ -35,7 +35,7 @@ static void skb_debug(const struct sk_buff *skb) #ifdef SKB_DEBUG #define NUM2PRINT 50 print_hex_dump(KERN_DEBUG, "br2684: skb: ", DUMP_OFFSET, - 16, 1, skb->data, min(NUM2PRINT, skb->len), true); + 16, 1, skb->data, min(NUM2PRINT, skb->len), DUMP_FLAG_ASCII); #endif } =20 diff --git a/net/atm/lec.c b/net/atm/lec.c index ffef658862db156c01e1de9f3cbccc453405f1dc..7a1242452959ed8e23cabcfd0d8= 423643a720f8e 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c @@ -256,7 +256,7 @@ static netdev_tx_t lec_start_xmit(struct sk_buff *skb, printk(KERN_DEBUG "%s: send datalen:%ld lecid:%4.4x\n", dev->name, skb->len, priv->lecid); print_hex_dump(KERN_DEBUG, "", DUMP_OFFSET, 16, 1, - skb->data, min(skb->len, MAX_DUMP_SKB), true); + skb->data, min(skb->len, MAX_DUMP_SKB), DUMP_FLAG_ASCII); #endif /* DUMP_PACKETS >=3D 1 */ =20 /* Minimum ethernet-frame size */ @@ -601,7 +601,7 @@ static void lec_push(struct atm_vcc *vcc, struct sk_buf= f *skb) printk(KERN_DEBUG "%s: rcv datalen:%ld lecid:%4.4x\n", dev->name, skb->len, priv->lecid); print_hex_dump(KERN_DEBUG, "", DUMP_OFFSET, 16, 1, - skb->data, min(MAX_SKB_DUMP, skb->len), true); + skb->data, min(MAX_SKB_DUMP, skb->len), DUMP_FLAG_ASCII); #endif /* DUMP_PACKETS > 0 */ if (memcmp(skb->data, lec_ctrl_magic, 4) =3D=3D 0) { /* Control frame, to daemon */ diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c index 01b2ce1e8fc06eec7cfdc2aa9c6cde5398a40fc3..f40c78a38ca0b3bd9beb81759ab= c1c55469ff2fb 100644 --- a/net/ceph/crypto.c +++ b/net/ceph/crypto.c @@ -229,9 +229,9 @@ static int ceph_aes_crypt(const struct ceph_crypto_key = *key, bool encrypt, =20 /* print_hex_dump(KERN_ERR, "key: ", DUMP_PREFIX_NONE, 16, 1, - key->key, key->len, 1); + key->key, key->len, DUMP_FLAG_ASCII); print_hex_dump(KERN_ERR, " in: ", DUMP_PREFIX_NONE, 16, 1, - buf, crypt_len, 1); + buf, crypt_len, DUMP_FLAG_ASCII); */ if (encrypt) ret =3D crypto_skcipher_encrypt(req); @@ -245,7 +245,7 @@ static int ceph_aes_crypt(const struct ceph_crypto_key = *key, bool encrypt, } /* print_hex_dump(KERN_ERR, "out: ", DUMP_PREFIX_NONE, 16, 1, - buf, crypt_len, 1); + buf, crypt_len, DUMP_FLAG_ASCII); */ =20 if (encrypt) { diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index d1b5705dc0c648f6515e142b5d756e868491fbbd..9ba4a4c01f2b6154e6688bc3555= dc52a98d7719a 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2200,19 +2200,15 @@ void ceph_msg_dump(struct ceph_msg *msg) { pr_debug("msg_dump %p (front_alloc_len %d length %zd)\n", msg, msg->front_alloc_len, msg->data_length); - print_hex_dump(KERN_DEBUG, "header: ", - DUMP_PREFIX_OFFSET, 16, 1, - &msg->hdr, sizeof(msg->hdr), true); - print_hex_dump(KERN_DEBUG, " front: ", - DUMP_PREFIX_OFFSET, 16, 1, - msg->front.iov_base, msg->front.iov_len, true); + print_hex_dump(KERN_DEBUG, "header: ", DUMP_PREFIX_OFFSET, 16, 1, + &msg->hdr, sizeof(msg->hdr), DUMP_FLAG_ASCII); + print_hex_dump(KERN_DEBUG, " front: ", DUMP_PREFIX_OFFSET, 16, 1, + msg->front.iov_base, msg->front.iov_len, DUMP_FLAG_ASCII); if (msg->middle) - print_hex_dump(KERN_DEBUG, "middle: ", - DUMP_PREFIX_OFFSET, 16, 1, - msg->middle->vec.iov_base, - msg->middle->vec.iov_len, true); - print_hex_dump(KERN_DEBUG, "footer: ", - DUMP_PREFIX_OFFSET, 16, 1, - &msg->footer, sizeof(msg->footer), true); + print_hex_dump(KERN_DEBUG, "middle: ", DUMP_PREFIX_OFFSET, 16, 1, + msg->middle->vec.iov_base, msg->middle->vec.iov_len, + DUMP_FLAG_ASCII); + print_hex_dump(KERN_DEBUG, "footer: ", DUMP_PREFIX_OFFSET, 16, 1, + &msg->footer, sizeof(msg->footer), DUMP_FLAG_ASCII); } EXPORT_SYMBOL(ceph_msg_dump); diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index 2950988738614fa90a6be8b3169a277fa963bcb4..f32f5d0b46718922ecdde5e32dd= 329e301ac52fa 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -1807,7 +1807,7 @@ static int osdmap_decode(void **p, void *end, bool ms= gr2, err, epoch, (int)(*p - start), *p, start, end); print_hex_dump(KERN_DEBUG, "osdmap: ", DUMP_PREFIX_OFFSET, 16, 1, - start, end - start, true); + start, end - start, DUMP_FLAG_ASCII); return err; } =20 @@ -2111,7 +2111,7 @@ struct ceph_osdmap *osdmap_apply_incremental(void **p= , void *end, bool msgr2, err, epoch, (int)(*p - start), *p, start, end); print_hex_dump(KERN_DEBUG, "osdmap: ", DUMP_PREFIX_OFFSET, 16, 1, - start, end - start, true); + start, end - start, DUMP_FLAG_ASCII); return ERR_PTR(err); } =20 diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 6841e61a6bd0b66e7b1df0545697604479c6b7a1..1eba90b6f8f5cb3bf220a1fb29f= ddb8ee199d11e 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -1353,17 +1353,17 @@ void skb_dump(const char *level, const struct sk_bu= ff *skb, bool full_pkt) =20 if (full_pkt && headroom) print_hex_dump(level, "skb headroom: ", DUMP_PREFIX_OFFSET, - 16, 1, skb->head, headroom, false); + 16, 1, skb->head, headroom, 0); =20 seg_len =3D min_t(int, skb_headlen(skb), len); if (seg_len) print_hex_dump(level, "skb linear: ", DUMP_PREFIX_OFFSET, - 16, 1, skb->data, seg_len, false); + 16, 1, skb->data, seg_len, 0); len -=3D seg_len; =20 if (full_pkt && tailroom) print_hex_dump(level, "skb tailroom: ", DUMP_PREFIX_OFFSET, - 16, 1, skb_tail_pointer(skb), tailroom, false); + 16, 1, skb_tail_pointer(skb), tailroom, 0); =20 for (i =3D 0; len && i < skb_shinfo(skb)->nr_frags; i++) { skb_frag_t *frag =3D &skb_shinfo(skb)->frags[i]; @@ -1386,7 +1386,7 @@ void skb_dump(const char *level, const struct sk_buff= *skb, bool full_pkt) vaddr =3D kmap_atomic(p); print_hex_dump(level, "skb frag: ", DUMP_PREFIX_OFFSET, - 16, 1, vaddr + p_off, seg_len, false); + 16, 1, vaddr + p_off, seg_len, 0); kunmap_atomic(vaddr); len -=3D seg_len; if (!len) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index e5603e84b20d1af6aba887746fcca3ee4080dad4..703b358b3ba7e82d24830edde23= a5f0988f25981 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1775,7 +1775,7 @@ static void ip_handle_martian_source(struct net_devic= e *dev, print_hex_dump(KERN_WARNING, "ll header: ", DUMP_PREFIX_OFFSET, 16, 1, skb_mac_header(skb), - dev->hard_header_len, false); + dev->hard_header_len, 0); } } #endif diff --git a/net/nfc/digital_core.c b/net/nfc/digital_core.c index dae378f1d52b607abf1cd0931473b28a390f1949..fcdb34f0bd9714fd1bc4e57bdee= 48c7955f21c89 100644 --- a/net/nfc/digital_core.c +++ b/net/nfc/digital_core.c @@ -129,7 +129,7 @@ static void digital_wq_cmd_complete(struct work_struct = *work) =20 if (!IS_ERR(cmd->resp)) print_hex_dump_debug("DIGITAL RX: ", DUMP_PREFIX_NONE, 16, 1, - cmd->resp->data, cmd->resp->len, false); + cmd->resp->data, cmd->resp->len, 0); =20 cmd->cmd_cb(ddev, cmd->cb_context, cmd->resp); =20 @@ -173,7 +173,7 @@ static void digital_wq_cmd(struct work_struct *work) =20 if (cmd->req) print_hex_dump_debug("DIGITAL TX: ", DUMP_PREFIX_NONE, 16, 1, - cmd->req->data, cmd->req->len, false); + cmd->req->data, cmd->req->len, 0); =20 switch (cmd->type) { case DIGITAL_CMD_IN_SEND: diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c index 18be13fb9b75a3b06fa25308afa5d71f06d4327a..1addf4cbc053640b0813b7fbb09= 9cba61fcf5c6a 100644 --- a/net/nfc/llcp_core.c +++ b/net/nfc/llcp_core.c @@ -780,7 +780,7 @@ static void nfc_llcp_tx_work(struct work_struct *work) =20 pr_debug("Sending pending skb\n"); print_hex_dump_debug("LLCP Tx: ", DUMP_PREFIX_OFFSET, - 16, 1, skb->data, skb->len, true); + 16, 1, skb->data, skb->len, DUMP_FLAG_ASCII); =20 if (ptype =3D=3D LLCP_PDU_I) copy_skb =3D skb_copy(skb, GFP_ATOMIC); @@ -1459,7 +1459,7 @@ static void nfc_llcp_rx_skb(struct nfc_llcp_local *lo= cal, struct sk_buff *skb) =20 if (ptype !=3D LLCP_PDU_SYMM) print_hex_dump_debug("LLCP Rx: ", DUMP_PREFIX_OFFSET, 16, 1, - skb->data, skb->len, true); + skb->data, skb->len, DUMP_FLAG_ASCII); =20 switch (ptype) { case LLCP_PDU_SYMM: diff --git a/samples/rpmsg/rpmsg_client_sample.c b/samples/rpmsg/rpmsg_clie= nt_sample.c index ae50816622839141245cc6d8e2c42a4f183402af..79cf698a2a94ae42e0905e61e45= 63a4ca21d7522 100644 --- a/samples/rpmsg/rpmsg_client_sample.c +++ b/samples/rpmsg/rpmsg_client_sample.c @@ -31,8 +31,7 @@ static int rpmsg_sample_cb(struct rpmsg_device *rpdev, vo= id *data, int len, dev_info(&rpdev->dev, "incoming msg %d (src: 0x%x)\n", ++idata->rx_count, src); =20 - print_hex_dump_debug(__func__, DUMP_PREFIX_NONE, 16, 1, data, len, - true); + print_hex_dump_debug(__func__, DUMP_PREFIX_NONE, 16, 1, data, len, DUMP_F= LAG_ASCII); =20 /* samples should not live forever */ if (idata->rx_count >=3D count) { diff --git a/security/integrity/ima/ima_kexec.c b/security/integrity/ima/im= a_kexec.c index 52e00332defed39774c9e23e045f1377cfa30d0c..bb2d2184c3babef66f0f75fd042= b7d5aecf6d766 100644 --- a/security/integrity/ima/ima_kexec.c +++ b/security/integrity/ima/ima_kexec.c @@ -63,8 +63,7 @@ static int ima_dump_measurement_list(unsigned long *buffe= r_size, void **buffer, memcpy(file.buf, &khdr, sizeof(khdr)); =20 print_hex_dump_debug("ima dump: ", DUMP_PREFIX_NONE, 16, 1, - file.buf, file.count < 100 ? file.count : 100, - true); + file.buf, file.count < 100 ? file.count : 100, DUMP_FLAG_ASCII); =20 *buffer_size =3D file.count; *buffer =3D file.buf; diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index e1a7f0b0c0f331fa01a85cf1b2db3ee37bf3b8d1..764dc169dcbcae5eb1183b45e5d= de0a481e6c010 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1324,7 +1324,7 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_= pin *pin, } =20 print_hex_dump_debug("ELD: ", DUMP_PREFIX_OFFSET, 16, 1, - port->eld.eld_buffer, port->eld.eld_size, false); + port->eld.eld_buffer, port->eld.eld_size, 0); =20 } mutex_unlock(&hdmi->pin_mutex); diff --git a/sound/soc/intel/atom/sst/sst_ipc.c b/sound/soc/intel/atom/sst/= sst_ipc.c index 0630e58b9d6bf0ad1fd794899490d8d23d7de42a..9726b6cc146afe1982916256f49= 4116fdd2d6dc3 100644 --- a/sound/soc/intel/atom/sst/sst_ipc.c +++ b/sound/soc/intel/atom/sst/sst_ipc.c @@ -293,7 +293,7 @@ static void process_fw_async_msg(struct intel_sst_drv *= sst_drv_ctx, dev_err(sst_drv_ctx->dev, "FW sent async error msg:\n"); for (i =3D 0; i < (data_size/4); i++) print_hex_dump(KERN_DEBUG, NULL, DUMP_PREFIX_NONE, - 16, 4, data_offset, data_size, false); + 16, 4, data_offset, data_size, 0); break; =20 case IPC_IA_FW_INIT_CMPLT_MRFLD: diff --git a/sound/soc/intel/catpt/loader.c b/sound/soc/intel/catpt/loader.c index 696d84314eeb5edcc83c93b3dead2a4d00d5f082..393a0f4e01b63e7a6792786c23e= ce1bcacf67576 100644 --- a/sound/soc/intel/catpt/loader.c +++ b/sound/soc/intel/catpt/loader.c @@ -243,7 +243,7 @@ static int catpt_restore_fwimage(struct catpt_dev *cdev, int i; =20 print_hex_dump_debug(__func__, DUMP_PREFIX_OFFSET, 8, 4, - blk, sizeof(*blk), false); + blk, sizeof(*blk), 0); =20 r1.start =3D cdev->dram.start + blk->ram_offset; r1.end =3D r1.start + blk->size - 1; @@ -295,7 +295,7 @@ static int catpt_load_block(struct catpt_dev *cdev, int ret; =20 print_hex_dump_debug(__func__, DUMP_PREFIX_OFFSET, 8, 4, - blk, sizeof(*blk), false); + blk, sizeof(*blk), 0); =20 switch (blk->ram_type) { case CATPT_RAM_TYPE_IRAM: @@ -333,7 +333,7 @@ static int catpt_restore_basefw(struct catpt_dev *cdev, int ret, i; =20 print_hex_dump_debug(__func__, DUMP_PREFIX_OFFSET, 8, 4, - basefw, sizeof(*basefw), false); + basefw, sizeof(*basefw), 0); =20 /* restore basefw image */ for (i =3D 0; i < basefw->blocks; i++) { @@ -376,7 +376,7 @@ static int catpt_restore_module(struct catpt_dev *cdev, int i; =20 print_hex_dump_debug(__func__, DUMP_PREFIX_OFFSET, 8, 4, - mod, sizeof(*mod), false); + mod, sizeof(*mod), 0); =20 for (i =3D 0; i < mod->blocks; i++) { struct catpt_fw_block_hdr *blk; @@ -418,7 +418,7 @@ static int catpt_load_module(struct catpt_dev *cdev, int i; =20 print_hex_dump_debug(__func__, DUMP_PREFIX_OFFSET, 8, 4, - mod, sizeof(*mod), false); + mod, sizeof(*mod), 0); =20 type =3D &cdev->modules[mod->module_id]; =20 @@ -464,7 +464,7 @@ static int catpt_restore_firmware(struct catpt_dev *cde= v, int i; =20 print_hex_dump_debug(__func__, DUMP_PREFIX_OFFSET, 8, 4, - fw, sizeof(*fw), false); + fw, sizeof(*fw), 0); =20 for (i =3D 0; i < fw->modules; i++) { struct catpt_fw_mod_hdr *mod; @@ -510,7 +510,7 @@ static int catpt_load_firmware(struct catpt_dev *cdev, int i; =20 print_hex_dump_debug(__func__, DUMP_PREFIX_OFFSET, 8, 4, - fw, sizeof(*fw), false); + fw, sizeof(*fw), 0); =20 for (i =3D 0; i < fw->modules; i++) { struct catpt_fw_mod_hdr *mod; diff --git a/sound/soc/sof/ipc3.c b/sound/soc/sof/ipc3.c index 7de5e3d285e73dcbf258060e57d26c27cbe40e43..ffeb48484d2d9e11749dee8671d= 60069c1fa2ae6 100644 --- a/sound/soc/sof/ipc3.c +++ b/sound/soc/sof/ipc3.c @@ -228,7 +228,7 @@ static void sof_ipc3_dump_payload(struct snd_sof_dev *s= dev, { dev_dbg(sdev->dev, "Size of payload following the header: %zu\n", size); print_hex_dump_debug("Message payload: ", DUMP_PREFIX_OFFSET, - 16, 4, ipc_data, size, false); + 16, 4, ipc_data, size, 0); } =20 static int sof_ipc3_get_reply(struct snd_sof_dev *sdev) diff --git a/sound/soc/sof/ipc4.c b/sound/soc/sof/ipc4.c index 4386cbae16d4ed18619f549343b86bc837c39398..2b6025c1e102cc19cfa54f9e3aa= 4c44f1723098f 100644 --- a/sound/soc/sof/ipc4.c +++ b/sound/soc/sof/ipc4.c @@ -260,7 +260,7 @@ static void sof_ipc4_dump_payload(struct snd_sof_dev *s= dev, void *ipc_data, size_t size) { print_hex_dump_debug("Message payload: ", DUMP_PREFIX_OFFSET, - 16, 4, ipc_data, size, false); + 16, 4, ipc_data, size, 0); } =20 static int sof_ipc4_get_reply(struct snd_sof_dev *sdev) diff --git a/sound/usb/bcd2000/bcd2000.c b/sound/usb/bcd2000/bcd2000.c index 392b4d8e9e7696443c5181ba6098a3da4ab7e456..e1ba777fb6924c66f88d8cccfe8= e9e2285832dbd 100644 --- a/sound/usb/bcd2000/bcd2000.c +++ b/sound/usb/bcd2000/bcd2000.c @@ -69,7 +69,7 @@ static void bcd2000_dump_buffer(const char *prefix, const= char *buf, int len) { print_hex_dump(KERN_DEBUG, prefix, DUMP_PREFIX_NONE, 16, 1, - buf, len, false); + buf, len, 0); } #else static void bcd2000_dump_buffer(const char *prefix, const char *buf, int l= en) {} diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 8bc959b60be3b66b8045081e89a41fc5eb5f23bc..d2485dda544a78341b34c023b0d= 8176d531d1d0f 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1310,7 +1310,7 @@ static int snd_usb_motu_microbookii_communicate(struc= t usb_device *dev, u8 *buf, return err; =20 print_hex_dump(KERN_DEBUG, "MicroBookII snd: ", DUMP_PREFIX_NONE, 16, 1, - buf, actual_length, false); + buf, actual_length, 0); =20 memset(buf, 0, buf_size); =20 @@ -1322,7 +1322,7 @@ static int snd_usb_motu_microbookii_communicate(struc= t usb_device *dev, u8 *buf, return err; =20 print_hex_dump(KERN_DEBUG, "MicroBookII rcv: ", DUMP_PREFIX_NONE, 16, 1, - buf, actual_length, false); + buf, actual_length, 0); =20 *length =3D actual_length; return 0; diff --git a/sound/usb/validate.c b/sound/usb/validate.c index 6fe206f6e91105c05b09b190fc1dfe15b51352dc..3f5e4b7301eb7a877bc5339d693= 89be7df2bc5fb 100644 --- a/sound/usb/validate.c +++ b/sound/usb/validate.c @@ -328,7 +328,7 @@ bool snd_usb_validate_audio_desc(void *p, int protocol) valid =3D validate_desc(p, protocol, audio_validators); if (!valid && snd_usb_skip_validation) { print_hex_dump(KERN_ERR, "USB-audio: buggy audio desc: ", - DUMP_PREFIX_NONE, 16, 1, c, c[0], true); + DUMP_PREFIX_NONE, 16, 1, c, c[0], DUMP_FLAG_ASCII); valid =3D true; } return valid; @@ -342,7 +342,7 @@ bool snd_usb_validate_midi_desc(void *p) valid =3D validate_desc(p, UAC_VERSION_1, midi_validators); if (!valid && snd_usb_skip_validation) { print_hex_dump(KERN_ERR, "USB-audio: buggy midi desc: ", - DUMP_PREFIX_NONE, 16, 1, c, c[0], true); + DUMP_PREFIX_NONE, 16, 1, c, c[0], DUMP_FLAG_ASCII); valid =3D true; } return valid; diff --git a/tools/testing/crypto/chacha20-s390/test-cipher.c b/tools/testi= ng/crypto/chacha20-s390/test-cipher.c index 8141d45df51aa56e0789be6b31c13a8742cd1030..1345eb29531ed3e20ac70a7b21b= ab2d063dd13ee 100644 --- a/tools/testing/crypto/chacha20-s390/test-cipher.c +++ b/tools/testing/crypto/chacha20-s390/test-cipher.c @@ -59,10 +59,10 @@ static int test_lib_chacha(u8 *revert, u8 *cipher, u8 *= plain) =20 if (debug) { print_hex_dump(KERN_INFO, "key: ", DUMP_PREFIX_OFFSET, - 16, 1, key, 32, 1); + 16, 1, key, 32, DUMP_FLAG_ASCII); =20 print_hex_dump(KERN_INFO, "iv: ", DUMP_PREFIX_OFFSET, - 16, 1, iv, 16, 1); + 16, 1, iv, 16, DUMP_FLAG_ASCII); } =20 /* Encrypt */ @@ -74,9 +74,8 @@ static int test_lib_chacha(u8 *revert, u8 *cipher, u8 *pl= ain) =20 =20 if (debug) - print_hex_dump(KERN_INFO, "encr:", DUMP_PREFIX_OFFSET, - 16, 1, cipher, - (data_size > 64 ? 64 : data_size), 1); + print_hex_dump(KERN_INFO, "encr:", DUMP_PREFIX_OFFSET, 16, 1, cipher, + (data_size > 64 ? 64 : data_size), DUMP_FLAG_ASCII); =20 pr_info("lib encryption took: %lld nsec", end - start); =20 @@ -88,9 +87,8 @@ static int test_lib_chacha(u8 *revert, u8 *cipher, u8 *pl= ain) end =3D ktime_get_ns(); =20 if (debug) - print_hex_dump(KERN_INFO, "decr:", DUMP_PREFIX_OFFSET, - 16, 1, revert, - (data_size > 64 ? 64 : data_size), 1); + print_hex_dump(KERN_INFO, "decr:", DUMP_PREFIX_OFFSET, 16, 1, + revert, (data_size > 64 ? 64 : data_size), DUMP_FLAG_ASCII); =20 pr_info("lib decryption took: %lld nsec", end - start); =20 @@ -160,10 +158,10 @@ static int test_skcipher(char *name, u8 *revert, u8 *= cipher, u8 *plain) =20 if (debug) { print_hex_dump(KERN_INFO, "key: ", DUMP_PREFIX_OFFSET, - 16, 1, key, 32, 1); + 16, 1, key, 32, DUMP_FLAG_ASCII); =20 print_hex_dump(KERN_INFO, "iv: ", DUMP_PREFIX_OFFSET, - 16, 1, iv, 16, 1); + 16, 1, iv, 16, DUMP_FLAG_ASCII); } =20 sk.tfm =3D skcipher; @@ -187,9 +185,8 @@ static int test_skcipher(char *name, u8 *revert, u8 *ci= pher, u8 *plain) pr_info("%s tfm encryption successful, took %lld nsec\n", name, end - sta= rt); =20 if (debug) - print_hex_dump(KERN_INFO, "encr:", DUMP_PREFIX_OFFSET, - 16, 1, cipher, - (data_size > 64 ? 64 : data_size), 1); + print_hex_dump(KERN_INFO, "encr:", DUMP_PREFIX_OFFSET, 16, 1, cipher, + (data_size > 64 ? 64 : data_size), DUMP_FLAG_ASCII); =20 /* Prepare for decryption */ memset(iv, 'I', sizeof(iv)); @@ -211,9 +208,8 @@ static int test_skcipher(char *name, u8 *revert, u8 *ci= pher, u8 *plain) pr_info("%s tfm decryption successful, took %lld nsec\n", name, end - sta= rt); =20 if (debug) - print_hex_dump(KERN_INFO, "decr:", DUMP_PREFIX_OFFSET, - 16, 1, revert, - (data_size > 64 ? 64 : data_size), 1); + print_hex_dump(KERN_INFO, "decr:", DUMP_PREFIX_OFFSET, 16, 1, revert, + (data_size > 64 ? 64 : data_size), DUMP_FLAG_ASCII); =20 /* Dump some internal skcipher data */ if (debug) @@ -274,9 +270,8 @@ static int __init chacha_s390_test_init(void) } =20 if (debug) - print_hex_dump(KERN_INFO, "src: ", DUMP_PREFIX_OFFSET, - 16, 1, plain, - (data_size > 64 ? 64 : data_size), 1); + print_hex_dump(KERN_INFO, "src: ", DUMP_PREFIX_OFFSET, 16, 1, plain, + (data_size > 64 ? 64 : data_size), DUMP_FLAG_ASCII); =20 /* Use chacha20 generic */ ret =3D test_skcipher("chacha20-generic", revert, cipher_generic, plain); diff --git a/tools/testing/nvdimm/test/nfit.c b/tools/testing/nvdimm/test/n= fit.c index cfd4378e2129b2fc6614060e622e79cdaf9b0183..ac9cf568742a08e28556985fe9f= c349bef69bb90 100644 --- a/tools/testing/nvdimm/test/nfit.c +++ b/tools/testing/nvdimm/test/nfit.c @@ -1342,7 +1342,7 @@ static void nfit_ctl_dbg(struct acpi_nfit_desc *acpi_= desc, nvdimm ? nvdimm_name(nvdimm) : "bus", family, cmd, func, len); print_hex_dump_debug("nvdimm in ", DUMP_PREFIX_OFFSET, 16, 4, - buf, min(len, 256u), true); + buf, min(len, 256u), DUMP_FLAG_ASCII); } =20 static int nfit_test_ctl(struct nvdimm_bus_descriptor *nd_desc, --=20 2.47.0 From nobody Sun Feb 8 17:04:13 2026 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E48AF228CB5; Fri, 10 Jan 2025 18:42:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736534549; cv=none; b=SzLWMQn+soskkxUpvapcFTpBcEbaZeOqKGe6B75V/Nby/DhENqLB8alA67akxkPKbwdfjbVo/jvWV56Tb/HufFBjYtSd3BeyC43lWVvY9lnpnDtuQjQRD5mjwRHausJhVlzs7TnOch7o2IL82FRfHSo9Ujj8miv53FURMfD/2ck= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736534549; c=relaxed/simple; bh=XrKo0J1Wwa62xaxBr/FHq+uX+uQrrAIgJFaR8zAXlZY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oWDKLvCm00seQdLXGSayGV3RcZ3tDFrujXUiwPlzdCy3i32cR11GriK+RglMeaQRDaYqsYWY1+cYJhclQlJP7nM0BfDcKtHSv6/ZBmN/SPqdQEI5XQJZ2AFayE3tfyxJVP2fbfpRiHaczJeJrmM5NYB93sok6HXMLRYQj0yyHgM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=m0ezzI/C; arc=none smtp.client-ip=217.70.183.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="m0ezzI/C" Received: by mail.gandi.net (Postfix) with ESMTPSA id 38F3E1C0004; Fri, 10 Jan 2025 18:42:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1736534533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5AqfChsBublPKNPqDj7oUFnFVtEI9kPgit48CypPI1M=; b=m0ezzI/Cm86cntiMXdthCCs0qLTrjBOeVc4By3Kn/8DA4GQYgoZJrZ9KrZIjeYIxTjVo1r DCoobkmIpJ5TkgU3E8UNNt6x7Q29ELbupeUspu0xQFQkflwI63RO9GvlMWRi7NM4r7jrel NIV/t3ig4hFr9tYd6oWmeKZfQG7CN7ApMjs5EzK6CzRAua1+Tl1nsnppOwxYiejWZxqQ0r Jb32CPlToo2uV40yTqsIiJAvnfukre3enyU7UsHdLEHfSP+Dc7osCUAfjsoAkUBUsbB5LG BxTtcZ61OzVNdLNiBHnnQgBXDof1ZpJwv3/3xLIiRNl9EDQfjVNjlrh/+9X2vA== From: Miquel Raynal Date: Fri, 10 Jan 2025 19:42:05 +0100 Subject: [PATCH v2 2/2] hexdump: Allow skipping identical lines Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250110-perso-hexdump-v2-2-7f9a6a799170@bootlin.com> References: <20250110-perso-hexdump-v2-0-7f9a6a799170@bootlin.com> In-Reply-To: <20250110-perso-hexdump-v2-0-7f9a6a799170@bootlin.com> To: Petr Mladek , Steven Rostedt , Rasmus Villemoes , Sergey Senozhatsky , Jonathan Corbet , John Ogness , Andrew Morton Cc: Andy Shevchenko , Thomas Petazzoni , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Miquel Raynal X-Mailer: b4 0.15-dev X-GND-Sasl: miquel.raynal@bootlin.com When dumping long buffers (especially for debug purposes) it may be very convenient to sometimes avoid spitting all the lines of the buffer if the lines are identical. Typically on embedded devices, the console would be wired to a UART running at 115200 bauds, which makes the dumps very (very) slow. In this case, having a flag to avoid printing duplicated lines is handy. Example of a made up repetitive output: 0f 53 63 47 56 55 78 7a aa b7 8c ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff 01 2a 39 eb Same but with the flag enabled: 0f 53 63 47 56 55 78 7a aa b7 8c ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff * ff ff ff ff ff ff ff ff ff ff ff ff 01 2a 39 eb Signed-off-by: Miquel Raynal --- Documentation/core-api/printk-formats.rst | 4 +++- include/linux/printk.h | 1 + lib/hexdump.c | 21 +++++++++++++++++++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core= -api/printk-formats.rst index ecccc0473da9c10f45f2464566f690472c61401e..90e6616284d1faf5882019eba8d= e6bebffe4883a 100644 --- a/Documentation/core-api/printk-formats.rst +++ b/Documentation/core-api/printk-formats.rst @@ -310,7 +310,9 @@ Raw buffer as a hex string =20 For printing small buffers (up to 64 bytes long) as a hex string with a certain separator. For larger buffers consider using -:c:func:`print_hex_dump`. +:c:func:`print_hex_dump`, especially since dupplicated lines can be +skipped automatically to reduce the overhead with the +``DUMP_FLAG_SKIP_IDENTICAL_LINES`` flag. =20 MAC/FDDI addresses ------------------ diff --git a/include/linux/printk.h b/include/linux/printk.h index 59e9e4c445108d66a3df422cfeaf79920e2ff08f..f89b4117483dce34d2da2f69984= 8f16304deb942 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -755,6 +755,7 @@ enum { =20 enum { DUMP_FLAG_ASCII, + DUMP_FLAG_SKIP_IDENTICAL_LINES, }; =20 extern int hex_dump_to_buffer(const void *buf, size_t len, int rowsize, diff --git a/lib/hexdump.c b/lib/hexdump.c index 4ac9c32c28a046d2ca037eaef95c785c1a866627..eaacd3f95b0442c0cebe884b26d= 9fc12e237eb68 100644 --- a/lib/hexdump.c +++ b/lib/hexdump.c @@ -4,6 +4,7 @@ */ =20 #include +#include #include #include #include @@ -239,7 +240,8 @@ EXPORT_SYMBOL(hex_dump_to_buffer); * @buf: data blob to dump * @len: number of bytes in the @buf * @flags: controls the output, typically %DUMP_FLAG_ASCII will print the = ascii - * equivalent after the hex output. + * equivalent after the hex output, %DUMP_FLAG_SKIP_IDENTICAL_LINES will d= isplay + * a single '*' instead of duplicated lines. * * Given a buffer of u8 data, print_hex_dump() prints a hex + ASCII dump * to the kernel log at the specified kernel log level, with an optional @@ -264,8 +266,9 @@ void print_hex_dump(const char *level, const char *pref= ix_str, int prefix_type, const void *buf, size_t len, unsigned int flags) { const u8 *ptr =3D buf; - int i, linelen, remaining =3D len; + int i, prev_i, linelen, remaining =3D len; unsigned char linebuf[32 * 3 + 2 + 32 + 1]; + bool same_line =3D false; =20 if (rowsize !=3D 16 && rowsize !=3D 32) rowsize =3D 16; @@ -274,6 +277,20 @@ void print_hex_dump(const char *level, const char *pre= fix_str, int prefix_type, linelen =3D min(remaining, rowsize); remaining -=3D rowsize; =20 + if (flags & DUMP_FLAG_SKIP_IDENTICAL_LINES) { + if (i && !memcmp(ptr + i, ptr + prev_i, linelen)) { + prev_i =3D i; + if (same_line) + continue; + same_line =3D true; + printk("%s*\n", level); + continue; + } else { + prev_i =3D i; + same_line =3D false; + } + } + hex_dump_to_buffer(ptr + i, linelen, rowsize, groupsize, linebuf, sizeof(linebuf), flags & DUMP_FLAG_ASCII); --=20 2.47.0