Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 5.4-2.3.x-imx up to v5.4.114 #316

Merged
merged 73 commits into from
Apr 22, 2021
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
94ac0a8
Revert "scsi: qla2xxx: Retry PLOGI on FC-NVMe PRLI failure"
Apr 16, 2021
33beb0e
Revert "scsi: qla2xxx: Fix stuck login session using prli_pend_timer"
Apr 16, 2021
8eed34d
scsi: qla2xxx: Dual FCP-NVMe target port support
Sep 12, 2019
8b5e82a
scsi: qla2xxx: Fix device connect issues in P2P configuration
Nov 5, 2019
ad66dc6
scsi: qla2xxx: Retry PLOGI on FC-NVMe PRLI failure
Nov 5, 2019
c393c7f
scsi: qla2xxx: Add a shadow variable to hold disc_state history of fc…
Dec 17, 2019
ca0188d
scsi: qla2xxx: Fix stuck login session using prli_pend_timer
Dec 17, 2019
304c217
scsi: qla2xxx: Fix fabric scan hang
Dec 17, 2019
6180d22
net/sctp: fix race condition in sctp_destroy_sock
Apr 13, 2021
2dce570
Input: nspire-keypad - enable interrupts only when opened
Vogtinator Mar 23, 2021
5130cda
gpio: sysfs: Obey valid_mask
M-Vaittinen Mar 29, 2021
09db44a
dmaengine: dw: Make it dependent to HAS_IOMEM
andy-shev Mar 24, 2021
4609d27
ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race
tmlind Mar 8, 2021
6ffc9f8
ARM: dts: Fix moving mmc devices with aliases for omap4 & 5
tmlind Mar 8, 2021
68bd0d8
lockdep: Add a missing initialization hint to the "INFO: Trying to re…
Mar 21, 2021
47d04c0
arc: kernel: Return -EFAULT if copy_to_user() fails
Mar 1, 2021
1cf8b48
ASoC: max98373: Added 30ms turn on/off time delay
Mar 25, 2021
f318386
neighbour: Disregard DEAD dst in neigh_update
Mar 19, 2021
4f02dc4
ARM: keystone: fix integer overflow warning
arndb Mar 23, 2021
01e86da
ARM: omap1: fix building with clang IAS
arndb Mar 8, 2021
d60837a
drm/msm: Fix a5xx/a6xx timestamps
robclark Mar 25, 2021
f0268d3
ASoC: fsl_esai: Fix TDM slot setup for I2S mode
shcgit Apr 2, 2021
e169980
scsi: scsi_transport_srp: Don't block target in SRP_PORT_LOST state
mwilck Apr 1, 2021
d8b4f3a
net: ieee802154: stop dump llsec keys for monitors
Apr 5, 2021
5d02540
net: ieee802154: forbid monitor for add llsec key
Apr 5, 2021
178ddee
net: ieee802154: forbid monitor for del llsec key
Apr 5, 2021
f9d7088
net: ieee802154: stop dump llsec devs for monitors
Apr 5, 2021
c993c05
net: ieee802154: forbid monitor for add llsec dev
Apr 5, 2021
6c8caf7
net: ieee802154: forbid monitor for del llsec dev
Apr 5, 2021
0d5ee2e
net: ieee802154: stop dump llsec devkeys for monitors
Apr 5, 2021
6358137
net: ieee802154: forbid monitor for add llsec devkey
Apr 5, 2021
fc5f9c3
net: ieee802154: forbid monitor for del llsec devkey
Apr 5, 2021
7a7899e
net: ieee802154: stop dump llsec seclevels for monitors
Apr 5, 2021
9e249bc
net: ieee802154: forbid monitor for add llsec seclevel
Apr 5, 2021
f666567
pcnet32: Use pci_resource_len to validate PCI resource
groeck Apr 6, 2021
bd7e90c
mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN
Mar 19, 2021
7a2ac9e
virt_wifi: Return micros for BSS TSF values
Databean Mar 18, 2021
995503d
Input: s6sy761 - fix coordinate read bit shift
calebccff Mar 7, 2021
b428063
Input: i8042 - fix Pegatron C15B ID entry
arndb Mar 23, 2021
8046076
HID: wacom: set EV_KEY and EV_ABS only for non-HID_GENERIC type of de…
Pinglinux Mar 11, 2021
ff821c7
dm verity fec: fix misaligned RS roots IO
Apr 14, 2021
b995695
readdir: make sure to verify directory entry for legacy interfaces too
torvalds Apr 17, 2021
b7d1516
arm64: fix inline asm in load_unaligned_zeropad()
pcc Apr 1, 2021
9e8c5e3
arm64: alternatives: Move length validation in alternative_{insn, endif}
nathanchance Apr 14, 2021
ec3bb71
vfio/pci: Add missing range check in vfio_pci_mmap
Apr 12, 2021
7779f84
riscv: Fix spelling mistake "SPARSEMEM" to "SPARSMEM"
Mar 29, 2021
5f6c1a8
scsi: libsas: Reset num_scatter if libata marks qc as NODATA
Mar 18, 2021
4ce8e86
netfilter: conntrack: do not print icmpv6 as unknown via /proc
ummakynes Mar 30, 2021
61ca5b6
libnvdimm/region: Fix nvdimm_has_flush() to handle ND_REGION_ASYNC
vaibhav92 Apr 2, 2021
ce23be3
netfilter: bridge: add pre_exit hooks for ebtable unregistration
Apr 7, 2021
6449b40
netfilter: arp_tables: add pre_exit hook for table unregister
Apr 7, 2021
e65cd80
net: macb: fix the restore of cmp registers
claudiubeznea Apr 14, 2021
01fb162
netfilter: nft_limit: avoid possible divide error in nft_limit_init
Apr 9, 2021
4fcbb1f
net: davicom: Fix regulator not turned off on failed probe
tititiou36 Apr 11, 2021
92f93a0
net: sit: Unregister catch-all devices
hvenev Apr 12, 2021
51edda8
net: ip6_tunnel: Unregister catch-all devices
hvenev Apr 12, 2021
2bc14f5
i40e: fix the panic when running bpf in xdpdrv mode
Apr 14, 2021
c6acd7d
ibmvnic: avoid calling napi_disable() twice
Apr 14, 2021
c591bba
ibmvnic: remove duplicate napi_schedule call in do_reset function
Apr 14, 2021
fde195c
ibmvnic: remove duplicate napi_schedule call in open function
Apr 14, 2021
9a7ac9a
gro: ensure frag0 meets IP header alignment
Apr 13, 2021
871b569
ARM: footbridge: fix PCI interrupt mapping
Mar 25, 2021
b14992c
arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems
Andre-ARM Mar 16, 2021
c667953
r8169: remove fiddling with the PCIe max read request size
hkallweit Oct 21, 2019
0243bb3
r8169: simplify setting PCI_EXP_DEVCTL_NOSNOOP_EN
hkallweit Oct 21, 2019
cbbd3e2
r8169: fix performance regression related to PCIe max read request size
hkallweit Feb 5, 2020
50b7a68
r8169: improve rtl_jumbo_config
hkallweit Feb 15, 2020
c5934da
r8169: tweak max read request size for newer chips also in jumbo mtu …
hkallweit Jan 9, 2021
4f0cda5
r8169: don't advertise pause in jumbo mode
hkallweit Apr 14, 2021
cec3b77
ARM: 9071/1: uprobes: Don't hook on thumb instructions
frestr Apr 5, 2021
3822683
net: phy: marvell: fix detection of PHY on Topaz switches
pali Apr 12, 2021
a7eb81c
Linux 5.4.114
gregkh Apr 21, 2021
6800343
Merge tag 'v5.4.114' into 5.4-2.3.x-imx
zandrey Apr 21, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
scsi: libsas: Reset num_scatter if libata marks qc as NODATA
commit 176ddd8 upstream.

When the cache_type for the SCSI device is changed, the SCSI layer issues a
MODE_SELECT command. The caching mode details are communicated via a
request buffer associated with the SCSI command with data direction set as
DMA_TO_DEVICE (scsi_mode_select()). When this command reaches the libata
layer, as a part of generic initial setup, libata layer sets up the
scatterlist for the command using the SCSI command (ata_scsi_qc_new()).
This command is then translated by the libata layer into
ATA_CMD_SET_FEATURES (ata_scsi_mode_select_xlat()). The libata layer treats
this as a non-data command (ata_mselect_caching()), since it only needs an
ATA taskfile to pass the caching on/off information to the device. It does
not need the scatterlist that has been setup, so it does not perform
dma_map_sg() on the scatterlist (ata_qc_issue()). Unfortunately, when this
command reaches the libsas layer (sas_ata_qc_issue()), libsas layer sees it
as a non-data command with a scatterlist. It cannot extract the correct DMA
length since the scatterlist has not been mapped with dma_map_sg() for a
DMA operation. When this partially constructed SAS task reaches pm80xx
LLDD, it results in the following warning:

"pm80xx_chip_sata_req 6058: The sg list address
start_addr=0x0000000000000000 data_len=0x0end_addr_high=0xffffffff
end_addr_low=0xffffffff has crossed 4G boundary"

Update libsas to handle ATA non-data commands separately so num_scatter and
total_xfer_len remain 0.

Link: https://lore.kernel.org/r/[email protected]
Fixes: 53de092 ("scsi: libsas: Set data_dir as DMA_NONE if libata marks qc as NODATA")
Tested-by: Luo Jiaxing <[email protected]>
Reviewed-by: John Garry <[email protected]>
Signed-off-by: Jolly Shah <[email protected]>
Signed-off-by: Martin K. Petersen <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
Jolly Shah authored and gregkh committed Apr 21, 2021
commit 5f6c1a81713e082ac6a8c03c9ca58891c8ac85b8
9 changes: 4 additions & 5 deletions drivers/scsi/libsas/sas_ata.c
Original file line number Diff line number Diff line change
@@ -200,18 +200,17 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
memcpy(task->ata_task.atapi_packet, qc->cdb, qc->dev->cdb_len);
task->total_xfer_len = qc->nbytes;
task->num_scatter = qc->n_elem;
task->data_dir = qc->dma_dir;
} else if (qc->tf.protocol == ATA_PROT_NODATA) {
task->data_dir = DMA_NONE;
} else {
for_each_sg(qc->sg, sg, qc->n_elem, si)
xfer += sg_dma_len(sg);

task->total_xfer_len = xfer;
task->num_scatter = si;
}

if (qc->tf.protocol == ATA_PROT_NODATA)
task->data_dir = DMA_NONE;
else
task->data_dir = qc->dma_dir;
}
task->scatter = qc->sg;
task->ata_task.retry_count = 1;
task->task_state_flags = SAS_TASK_STATE_PENDING;