mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
This is mostly updates of the usual suspects: lpfc, qla2xxx, hisi_sas, megaraid_sas, pm80xx, mpt3sas, be2iscsi, hpsa. and a host of minor updates. There's no major behaviour change or additions to the core in all of this, so the potential for regressions should be small (biggest potential being in the scsi error handler changes). Signed-off-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABAgAGBQJaCxtCAAoJEAVr7HOZEZN4d9EQAI+OHP6ss6zjKKC21c9jNPcH NhLrNv37gHg/LA2VXeUEL9RGUjCGLIUrI4HsrxzkFAMLKP4TkshMs8/2RvczY+Sa VpayPqVybEKLIS6ipQyM1SLIQff2nvtDVcN/T+8z1lkk45TrbA6ZGuwUwd2aJyEA 2V2wtg51ObnL0Nr9QPPll0JrtL1AnCZyRlu9XrwTZuuSBZwk93opIuuvbZm/3dVg Ir4GSS4Y+PuHIfu4cxqdsPMdzRdY9I2me1YiE4jeFSn1/VTAjL4HBz7fO9eITT42 VhXSpDz1XvFsa9dJ0ubkqoALpJzCfOcBw+EuGvSydLEvOBoEVwMccdfaD9lT1zc5 L9e1Z5qqJoq7hTA6xTXCYfWG73I9HYvljtmc8yudKHhADOdnSTUXhaO6uBF0RNqD OxPSA1RZwRx3c6lDOcK6BTtvLAkTEuYKdrWSKJi0w+QXJAyQ6etqbmsKpmPdRim7 Z4ZSpJFro2gyo9gcdJO0ykTG+z3U7Z/ay1sNgnuprsv+eU/QjUdlAPl18o79EkRf H54zZggZ4wC6q/cFVVt4Vx+V+oqIeu38s7NDXS9UltLoTZPm2EzDW6pXd/38Z4Tf a1oBAUET8kYLC90P8sVZxUIHZjITlpgDbyE2Lq00PMYXhk8S4IxF0aMN5RvVqzUv +7N2HrHkSSgG1nhw1t+E =3O85 -----END PGP SIGNATURE----- Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi Pull SCSI updates from James Bottomley: "This is mostly updates of the usual suspects: lpfc, qla2xxx, hisi_sas, megaraid_sas, pm80xx, mpt3sas, be2iscsi, hpsa. and a host of minor updates. There's no major behaviour change or additions to the core in all of this, so the potential for regressions should be small (biggest potential being in the scsi error handler changes)" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (203 commits) scsi: lpfc: Fix hard lock up NMI in els timeout handling. scsi: mpt3sas: remove a stray KERN_INFO scsi: mpt3sas: cleanup _scsih_pcie_enumeration_event() scsi: aacraid: use timespec64 instead of timeval scsi: scsi_transport_fc: add 64GBIT and 128GBIT port speed definitions scsi: qla2xxx: Suppress a kernel complaint in qla_init_base_qpair() scsi: mpt3sas: fix dma_addr_t casts scsi: be2iscsi: Use kasprintf scsi: storvsc: Avoid excessive host scan on controller change scsi: lpfc: fix kzalloc-simple.cocci warnings scsi: mpt3sas: Update mpt3sas driver version. scsi: mpt3sas: Fix sparse warnings scsi: mpt3sas: Fix nvme drives checking for tlr. scsi: mpt3sas: NVMe drive support for BTDHMAPPING ioctl command and log info scsi: mpt3sas: Add-Task-management-debug-info-for-NVMe-drives. scsi: mpt3sas: scan and add nvme device after controller reset scsi: mpt3sas: Set NVMe device queue depth as 128 scsi: mpt3sas: Handle NVMe PCIe device related events generated from firmware. scsi: mpt3sas: API's to remove nvme drive from sml scsi: mpt3sas: API 's to support NVMe drive addition to SML ...
85 lines
3.6 KiB
C
85 lines
3.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _SCSI_LOGGING_H
|
|
#define _SCSI_LOGGING_H
|
|
|
|
|
|
/*
|
|
* This defines the scsi logging feature. It is a means by which the user can
|
|
* select how much information they get about various goings on, and it can be
|
|
* really useful for fault tracing. The logging word is divided into 10 3-bit
|
|
* bitfields, each of which describes a loglevel. The division of things is
|
|
* somewhat arbitrary, and the division of the word could be changed if it
|
|
* were really needed for any reason. The numbers below are the only place
|
|
* where these are specified. For a first go-around, 3 bits is more than
|
|
* enough, since this gives 8 levels of logging (really 7, since 0 is always
|
|
* off). Cutting to 2 bits might be wise at some point.
|
|
*/
|
|
|
|
#define SCSI_LOG_ERROR_SHIFT 0
|
|
#define SCSI_LOG_TIMEOUT_SHIFT 3
|
|
#define SCSI_LOG_SCAN_SHIFT 6
|
|
#define SCSI_LOG_MLQUEUE_SHIFT 9
|
|
#define SCSI_LOG_MLCOMPLETE_SHIFT 12
|
|
#define SCSI_LOG_LLQUEUE_SHIFT 15
|
|
#define SCSI_LOG_LLCOMPLETE_SHIFT 18
|
|
#define SCSI_LOG_HLQUEUE_SHIFT 21
|
|
#define SCSI_LOG_HLCOMPLETE_SHIFT 24
|
|
#define SCSI_LOG_IOCTL_SHIFT 27
|
|
|
|
#define SCSI_LOG_ERROR_BITS 3
|
|
#define SCSI_LOG_TIMEOUT_BITS 3
|
|
#define SCSI_LOG_SCAN_BITS 3
|
|
#define SCSI_LOG_MLQUEUE_BITS 3
|
|
#define SCSI_LOG_MLCOMPLETE_BITS 3
|
|
#define SCSI_LOG_LLQUEUE_BITS 3
|
|
#define SCSI_LOG_LLCOMPLETE_BITS 3
|
|
#define SCSI_LOG_HLQUEUE_BITS 3
|
|
#define SCSI_LOG_HLCOMPLETE_BITS 3
|
|
#define SCSI_LOG_IOCTL_BITS 3
|
|
|
|
extern unsigned int scsi_logging_level;
|
|
|
|
#ifdef CONFIG_SCSI_LOGGING
|
|
|
|
#define SCSI_LOG_LEVEL(SHIFT, BITS) \
|
|
((scsi_logging_level >> (SHIFT)) & ((1 << (BITS)) - 1))
|
|
|
|
#define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD) \
|
|
do { \
|
|
if (unlikely((SCSI_LOG_LEVEL(SHIFT, BITS)) > (LEVEL))) \
|
|
do { \
|
|
CMD; \
|
|
} while (0); \
|
|
} while (0)
|
|
#else
|
|
#define SCSI_LOG_LEVEL(SHIFT, BITS) 0
|
|
#define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD)
|
|
#endif /* CONFIG_SCSI_LOGGING */
|
|
|
|
/*
|
|
* These are the macros that are actually used throughout the code to
|
|
* log events. If logging isn't enabled, they are no-ops and will be
|
|
* completely absent from the user's code.
|
|
*/
|
|
#define SCSI_LOG_ERROR_RECOVERY(LEVEL,CMD) \
|
|
SCSI_CHECK_LOGGING(SCSI_LOG_ERROR_SHIFT, SCSI_LOG_ERROR_BITS, LEVEL,CMD);
|
|
#define SCSI_LOG_TIMEOUT(LEVEL,CMD) \
|
|
SCSI_CHECK_LOGGING(SCSI_LOG_TIMEOUT_SHIFT, SCSI_LOG_TIMEOUT_BITS, LEVEL,CMD);
|
|
#define SCSI_LOG_SCAN_BUS(LEVEL,CMD) \
|
|
SCSI_CHECK_LOGGING(SCSI_LOG_SCAN_SHIFT, SCSI_LOG_SCAN_BITS, LEVEL,CMD);
|
|
#define SCSI_LOG_MLQUEUE(LEVEL,CMD) \
|
|
SCSI_CHECK_LOGGING(SCSI_LOG_MLQUEUE_SHIFT, SCSI_LOG_MLQUEUE_BITS, LEVEL,CMD);
|
|
#define SCSI_LOG_MLCOMPLETE(LEVEL,CMD) \
|
|
SCSI_CHECK_LOGGING(SCSI_LOG_MLCOMPLETE_SHIFT, SCSI_LOG_MLCOMPLETE_BITS, LEVEL,CMD);
|
|
#define SCSI_LOG_LLQUEUE(LEVEL,CMD) \
|
|
SCSI_CHECK_LOGGING(SCSI_LOG_LLQUEUE_SHIFT, SCSI_LOG_LLQUEUE_BITS, LEVEL,CMD);
|
|
#define SCSI_LOG_LLCOMPLETE(LEVEL,CMD) \
|
|
SCSI_CHECK_LOGGING(SCSI_LOG_LLCOMPLETE_SHIFT, SCSI_LOG_LLCOMPLETE_BITS, LEVEL,CMD);
|
|
#define SCSI_LOG_HLQUEUE(LEVEL,CMD) \
|
|
SCSI_CHECK_LOGGING(SCSI_LOG_HLQUEUE_SHIFT, SCSI_LOG_HLQUEUE_BITS, LEVEL,CMD);
|
|
#define SCSI_LOG_HLCOMPLETE(LEVEL,CMD) \
|
|
SCSI_CHECK_LOGGING(SCSI_LOG_HLCOMPLETE_SHIFT, SCSI_LOG_HLCOMPLETE_BITS, LEVEL,CMD);
|
|
#define SCSI_LOG_IOCTL(LEVEL,CMD) \
|
|
SCSI_CHECK_LOGGING(SCSI_LOG_IOCTL_SHIFT, SCSI_LOG_IOCTL_BITS, LEVEL,CMD);
|
|
|
|
#endif /* _SCSI_LOGGING_H */
|