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

Commit e7fb5859 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream'

parents 80c7af40 c6329f4d

Documentation/kernel-parameters.txt

+8 −0
Original line number Diff line number Diff line
@@ -633,6 +633,14 @@ running once the system is up. 
	inport.irq=	[HW] Inport (ATI XL and Microsoft) busmouse driver

			Format: <irq>



	combined_mode=	[HW] control which driver uses IDE ports in combined

			mode: legacy IDE driver, libata, or both

			(in the libata case, libata.atapi_enabled=1 may be

			useful as well).  Note that using the ide or libata

			options may affect your device naming (e.g. by

			changing hdc to sdb).

			Format: combined (default), ide, or libata



	inttest=	[IA64]



	io7=		[HW] IO7 for Marvel based alpha systems

drivers/net/skge.c

+1 −1
Original line number Diff line number Diff line
@@ -2280,7 +2280,7 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev) 
 	}



	if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) {

		if (!netif_stopped(dev)) {

		if (!netif_queue_stopped(dev)) {

			netif_stop_queue(dev);



			printk(KERN_WARNING PFX "%s: ring full when queue awake!\n",

drivers/pci/quirks.c

+30 −0
Original line number Diff line number Diff line
@@ -1098,6 +1098,23 @@ static void __init quirk_alder_ioapic(struct pci_dev *pdev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_EESSC,	quirk_alder_ioapic );

#endif



enum ide_combined_type { COMBINED = 0, IDE = 1, LIBATA = 2 };

/* Defaults to combined */

static enum ide_combined_type combined_mode;



static int __init combined_setup(char *str)

{

	if (!strncmp(str, "ide", 3))

		combined_mode = IDE;

	else if (!strncmp(str, "libata", 6))

		combined_mode = LIBATA;

	else /* "combined" or anything else defaults to old behavior */

		combined_mode = COMBINED;



	return 1;

}

__setup("combined_mode=", combined_setup);



#ifdef CONFIG_SCSI_SATA_INTEL_COMBINED

static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev)

{
@@ -1164,6 +1181,19 @@ static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev) 
	if (prog & comb)

		return;



	/* Don't reserve any so the IDE driver can get them (but only if

	 * combined_mode=ide).

	 */

	if (combined_mode == IDE)

		return;



	/* Grab them both for libata if combined_mode=libata. */

	if (combined_mode == LIBATA) {

		request_region(0x1f0, 8, "libata");	/* port 0 */

		request_region(0x170, 8, "libata");	/* port 1 */

		return;

	}



	/* SATA port is in legacy mode.  Reserve port so that

	 * IDE driver does not attempt to use it.  If request_region

	 * fails, it will be obvious at boot time, so we don't bother

drivers/scsi/libata-scsi.c

+5 −2
Original line number Diff line number Diff line
@@ -2169,10 +2169,13 @@ ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev) 
	if (unlikely(!ata_dev_present(dev)))

		return NULL;



	if (!atapi_enabled) {

		if (unlikely(dev->class == ATA_DEV_ATAPI))

	if (!atapi_enabled || (ap->flags & ATA_FLAG_NO_ATAPI)) {

		if (unlikely(dev->class == ATA_DEV_ATAPI)) {

			printk(KERN_WARNING "ata%u(%u): WARNING: ATAPI is %s, device ignored.\n",

			       ap->id, dev->devno, atapi_enabled ? "not supported with this driver" : "disabled");

			return NULL;

		}

	}



	return dev;

}

drivers/scsi/sata_mv.c

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ enum { 
	MV_FLAG_DUAL_HC		= (1 << 30),  /* two SATA Host Controllers */

	MV_FLAG_IRQ_COALESCE	= (1 << 29),  /* IRQ coalescing capability */

	MV_COMMON_FLAGS		= (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO),

				   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |

				   ATA_FLAG_NO_ATAPI),

	MV_6XXX_FLAGS		= MV_FLAG_IRQ_COALESCE,



	CRQB_FLAG_READ		= (1 << 0),