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

Commit 0e38ed1a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.210 into android-4.19-stable 



Changes in 4.19.210
	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
	scsi: ses: Retry failed Send/Receive Diagnostic commands
	tools/vm/page-types: remove dependency on opt_file for idle page tracking
	libata: Add ATA_HORKAGE_NO_NCQ_ON_ATI for Samsung 860 and 870 SSD.
	lib/timerqueue: Rely on rbtree semantics for next timer
	Linux 4.19.210

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib6ae9d37c6e94c9a0d8f5875836fb8fdbef9ff70
parents 02e8f2ba e34184f5

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 209

SUBLEVEL = 210

EXTRAVERSION =

NAME = "People's Front"

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

drivers/ata/libata-core.c

+32 −2
Original line number Diff line number Diff line
@@ -2268,6 +2268,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)

{
@@ -2284,6 +2303,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;
@@ -4575,9 +4601,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, },
@@ -6934,6 +6962,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) },

drivers/net/phy/mdio_device.c

+11 −0
Original line number Diff line number Diff line
@@ -176,6 +176,16 @@ static int mdio_remove(struct device *dev) 
	return 0;

}



static void mdio_shutdown(struct device *dev)

{

	struct mdio_device *mdiodev = to_mdio_device(dev);

	struct device_driver *drv = mdiodev->dev.driver;

	struct mdio_driver *mdiodrv = to_mdio_driver(drv);



	if (mdiodrv->shutdown)

		mdiodrv->shutdown(mdiodev);

}



/**

 * mdio_driver_register - register an mdio_driver with the MDIO layer

 * @new_driver: new mdio_driver to register
@@ -190,6 +200,7 @@ int mdio_driver_register(struct mdio_driver *drv) 
	mdiodrv->driver.bus = &mdio_bus_type;

	mdiodrv->driver.probe = mdio_probe;

	mdiodrv->driver.remove = mdio_remove;

	mdiodrv->driver.shutdown = mdio_shutdown;



	retval = driver_register(&mdiodrv->driver);

	if (retval) {

drivers/net/xen-netback/netback.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static int xenvif_tx_check_gop(struct xenvif_queue *queue, 
				 * the header's copy failed, and they are

				 * sharing a slot, send an error

				 */

				if (i == 0 && sharedslot)

				if (i == 0 && !first_shinfo && sharedslot)

					xenvif_idx_release(queue, pending_idx,

							   XEN_NETIF_RSP_ERROR);

				else