Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17eb597c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.152 into android11-5.4-lts 



Changes in 5.4.152
	net: mdio: introduce a shutdown method to mdio device drivers
	xen-netback: correct success/error reporting for the SKB-with-fraglist case
	sparc64: fix pci_iounmap() when CONFIG_PCI is not set
	ext2: fix sleeping in atomic bugs on error
	scsi: sd: Free scsi_disk device via put_device()
	usb: testusb: Fix for showing the connection speed
	usb: dwc2: check return value after calling platform_get_resource()
	selftests: be sure to make khdr before other targets
	selftests:kvm: fix get_warnings_count() ignoring fscanf() return warn
	scsi: ses: Retry failed Send/Receive Diagnostic commands
	tools/vm/page-types: remove dependency on opt_file for idle page tracking
	KVM: do not shrink halt_poll_ns below grow_start
	kvm: x86: Add AMD PMU MSRs to msrs_to_save_all[]
	perf/x86: Reset destroy callback on event init failure
	silence nfscache allocation warnings with kvzalloc
	libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD.
	Linux 5.4.152

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I3a22857237d5a489f777d611132ff030b7c0fa13
parents 46590369 faaca480

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 151

SUBLEVEL = 152

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/sparc/lib/iomap.c

+2 −0
Original line number Diff line number Diff line
@@ -19,8 +19,10 @@ void ioport_unmap(void __iomem *addr) 
EXPORT_SYMBOL(ioport_map);

EXPORT_SYMBOL(ioport_unmap);



#ifdef CONFIG_PCI

void pci_iounmap(struct pci_dev *dev, void __iomem * addr)

{

	/* nothing to do */

}

EXPORT_SYMBOL(pci_iounmap);

#endif

arch/x86/events/core.c

+1 −0
Original line number Diff line number Diff line
@@ -2108,6 +2108,7 @@ static int x86_pmu_event_init(struct perf_event *event) 
	if (err) {

		if (event->destroy)

			event->destroy(event);

		event->destroy = NULL;

	}



	if (READ_ONCE(x86_pmu.attr_rdpmc) &&

arch/x86/kvm/x86.c

+7 −0
Original line number Diff line number Diff line
@@ -1239,6 +1239,13 @@ static const u32 msrs_to_save_all[] = { 
	MSR_ARCH_PERFMON_EVENTSEL0 + 12, MSR_ARCH_PERFMON_EVENTSEL0 + 13,

	MSR_ARCH_PERFMON_EVENTSEL0 + 14, MSR_ARCH_PERFMON_EVENTSEL0 + 15,

	MSR_ARCH_PERFMON_EVENTSEL0 + 16, MSR_ARCH_PERFMON_EVENTSEL0 + 17,



	MSR_K7_EVNTSEL0, MSR_K7_EVNTSEL1, MSR_K7_EVNTSEL2, MSR_K7_EVNTSEL3,

	MSR_K7_PERFCTR0, MSR_K7_PERFCTR1, MSR_K7_PERFCTR2, MSR_K7_PERFCTR3,

	MSR_F15H_PERF_CTL0, MSR_F15H_PERF_CTL1, MSR_F15H_PERF_CTL2,

	MSR_F15H_PERF_CTL3, MSR_F15H_PERF_CTL4, MSR_F15H_PERF_CTL5,

	MSR_F15H_PERF_CTR0, MSR_F15H_PERF_CTR1, MSR_F15H_PERF_CTR2,

	MSR_F15H_PERF_CTR3, MSR_F15H_PERF_CTR4, MSR_F15H_PERF_CTR5,

};



static u32 msrs_to_save[ARRAY_SIZE(msrs_to_save_all)];

drivers/ata/libata-core.c

+32 −2
Original line number Diff line number Diff line
@@ -2252,6 +2252,25 @@ static void ata_dev_config_ncq_prio(struct ata_device *dev) 


}



static bool ata_dev_check_adapter(struct ata_device *dev,

				  unsigned short vendor_id)

{

	struct pci_dev *pcidev = NULL;

	struct device *parent_dev = NULL;



	for (parent_dev = dev->tdev.parent; parent_dev != NULL;

	     parent_dev = parent_dev->parent) {

		if (dev_is_pci(parent_dev)) {

			pcidev = to_pci_dev(parent_dev);

			if (pcidev->vendor == vendor_id)

				return true;

			break;

		}

	}



	return false;

}



static int ata_dev_config_ncq(struct ata_device *dev,

			       char *desc, size_t desc_sz)

{
@@ -2268,6 +2287,13 @@ static int ata_dev_config_ncq(struct ata_device *dev, 
		snprintf(desc, desc_sz, "NCQ (not used)");

		return 0;

	}



	if (dev->horkage & ATA_HORKAGE_NO_NCQ_ON_ATI &&

	    ata_dev_check_adapter(dev, PCI_VENDOR_ID_ATI)) {

		snprintf(desc, desc_sz, "NCQ (not used)");

		return 0;

	}



	if (ap->flags & ATA_FLAG_NCQ) {

		hdepth = min(ap->scsi_host->can_queue, ATA_MAX_QUEUE);

		dev->flags |= ATA_DFLAG_NCQ;
@@ -4557,9 +4583,11 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	{ "Samsung SSD 850*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

	{ "Samsung SSD 860*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

						ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NO_NCQ_ON_ATI, },

	{ "Samsung SSD 870*",		NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },

						ATA_HORKAGE_ZERO_AFTER_TRIM |

						ATA_HORKAGE_NO_NCQ_ON_ATI, },

	{ "FCCT*M500*",			NULL,	ATA_HORKAGE_NO_NCQ_TRIM |

						ATA_HORKAGE_ZERO_AFTER_TRIM, },
@@ -6916,6 +6944,8 @@ static int __init ata_parse_force_one(char **cur, 
		{ "ncq",	.horkage_off	= ATA_HORKAGE_NONCQ },

		{ "noncqtrim",	.horkage_on	= ATA_HORKAGE_NO_NCQ_TRIM },

		{ "ncqtrim",	.horkage_off	= ATA_HORKAGE_NO_NCQ_TRIM },

		{ "noncqati",	.horkage_on	= ATA_HORKAGE_NO_NCQ_ON_ATI },

		{ "ncqati",	.horkage_off	= ATA_HORKAGE_NO_NCQ_ON_ATI },

		{ "dump_id",	.horkage_on	= ATA_HORKAGE_DUMP_ID },

		{ "pio0",	.xfer_mask	= 1 << (ATA_SHIFT_PIO + 0) },

		{ "pio1",	.xfer_mask	= 1 << (ATA_SHIFT_PIO + 1) },