Attachment #18331 for bug #11735




	.quirkproc		= ide_undecoded_slave,
};

static unsigned int delkin_cb_init_chipset(struct pci_dev *dev)
{
	unsigned long base = pci_resource_start(dev, 0);
	int i;

	outb(0x02, base + 0x1e);	/* set nIEN to block interrupts */
	inb(base + 0x17);		/* read status to clear interrupts */

	for (i = 0; i < sizeof(setup); ++i) {
		if (setup[i])
			outb(setup[i], base + i);
	}

	return 0;
}

static const struct ide_port_info delkin_cb_port_info = {
	.port_ops		= &delkin_cb_port_ops,
	.host_flags		= IDE_HFLAG_IO_32BIT | IDE_HFLAG_UNMASK_IRQS |
				  IDE_HFLAG_NO_DMA,
	.init_chipset		= delkin_cb_init_chipset,
};

static int __devinit

{
	struct ide_host *host;
	unsigned long base;
	int rc;
	hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };

	rc = pci_enable_device(dev);

		return rc;
	}
	base = pci_resource_start(dev, 0);

	delkin_cb_init_chipset(dev);
	for (i = 0; i < sizeof(setup); ++i) {
		if (setup[i])
			outb(setup[i], base + i);
	}

	memset(&hw, 0, sizeof(hw));
	ide_std_init_ports(&hw, base + 0x10, base + 0x1e);

	pci_disable_device(dev);
}

#ifdef CONFIG_PM
static int delkin_cb_suspend(struct pci_dev *dev, pm_message_t state)
{
	pci_save_state(dev);
	pci_disable_device(dev);
	pci_set_power_state(dev, pci_choose_state(dev, state));

	return 0;
}

static int delkin_cb_resume(struct pci_dev *dev)
{
	struct ide_host *host = pci_get_drvdata(dev);
	int rc;

	pci_set_power_state(dev, PCI_D0);

	rc = pci_enable_device(dev);
	if (rc)
		return rc;

	pci_restore_state(dev);
	pci_set_master(dev);

	if (host->init_chipset)
		host->init_chipset(dev);

	return 0;
}
#else
#define delkin_cb_suspend NULL
#define delkin_cb_resume NULL
#endif

static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = {
	{ 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
	{ 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

	.id_table	= delkin_cb_pci_tbl,
	.probe		= delkin_cb_probe,
	.remove		= delkin_cb_remove,
	.suspend	= delkin_cb_suspend,
	.resume		= delkin_cb_resume,
};

static int __init delkin_cb_init(void)

Return to bug 11735

Lines 46-55 static const struct ide_port_ops delkin_ Link Here

(-)b/drivers/ide/pci/delkin_cb.c (-7 / +56 lines)
46	.quirkproc = ide_undecoded_slave,	46	.quirkproc = ide_undecoded_slave,
47	};	47	};
48		48
		49	static unsigned int delkin_cb_init_chipset(struct pci_dev *dev)
		50	{
		51	unsigned long base = pci_resource_start(dev, 0);
		52	int i;
		53
		54	outb(0x02, base + 0x1e); /* set nIEN to block interrupts */
		55	inb(base + 0x17); /* read status to clear interrupts */
		56
		57	for (i = 0; i < sizeof(setup); ++i) {
		58	if (setup[i])
		59	outb(setup[i], base + i);
		60	}
		61
		62	return 0;
		63	}
		64
49	static const struct ide_port_info delkin_cb_port_info = {	65	static const struct ide_port_info delkin_cb_port_info = {
50	.port_ops = &delkin_cb_port_ops,	66	.port_ops = &delkin_cb_port_ops,
51	.host_flags = IDE_HFLAG_IO_32BIT \| IDE_HFLAG_UNMASK_IRQS \|	67	.host_flags = IDE_HFLAG_IO_32BIT \| IDE_HFLAG_UNMASK_IRQS \|
52	IDE_HFLAG_NO_DMA,	68	IDE_HFLAG_NO_DMA,
		69	.init_chipset = delkin_cb_init_chipset,
53	};	70	};
54		71
55	static int __devinit	72	static int __devinit
Lines 57-63 delkin_cb_probe (struct pci_dev *dev, co Link Here
57	{	74	{
58	struct ide_host *host;	75	struct ide_host *host;
59	unsigned long base;	76	unsigned long base;
60	int i, rc;	77	int rc;
61	hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };	78	hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
62		79
63	rc = pci_enable_device(dev);	80	rc = pci_enable_device(dev);
Lines 72-83 delkin_cb_probe (struct pci_dev *dev, co Link Here
72	return rc;	89	return rc;
73	}	90	}
74	base = pci_resource_start(dev, 0);	91	base = pci_resource_start(dev, 0);
75	outb(0x02, base + 0x1e); /* set nIEN to block interrupts */	92
76	inb(base + 0x17); /* read status to clear interrupts */	93	delkin_cb_init_chipset(dev);
77	for (i = 0; i < sizeof(setup); ++i) {
78	if (setup[i])
79	outb(setup[i], base + i);
80	}
81		94
82	memset(&hw, 0, sizeof(hw));	95	memset(&hw, 0, sizeof(hw));
83	ide_std_init_ports(&hw, base + 0x10, base + 0x1e);	96	ide_std_init_ports(&hw, base + 0x10, base + 0x1e);
Lines 110-115 delkin_cb_remove (struct pci_dev *dev) Link Here
110	pci_disable_device(dev);	123	pci_disable_device(dev);
111	}	124	}
112		125
		126	#ifdef CONFIG_PM
		127	static int delkin_cb_suspend(struct pci_dev *dev, pm_message_t state)
		128	{
		129	pci_save_state(dev);
		130	pci_disable_device(dev);
		131	pci_set_power_state(dev, pci_choose_state(dev, state));
		132
		133	return 0;
		134	}
		135
		136	static int delkin_cb_resume(struct pci_dev *dev)
		137	{
		138	struct ide_host *host = pci_get_drvdata(dev);
		139	int rc;
		140
		141	pci_set_power_state(dev, PCI_D0);
		142
		143	rc = pci_enable_device(dev);
		144	if (rc)
		145	return rc;
		146
		147	pci_restore_state(dev);
		148	pci_set_master(dev);
		149
		150	if (host->init_chipset)
		151	host->init_chipset(dev);
		152
		153	return 0;
		154	}
		155	#else
		156	#define delkin_cb_suspend NULL
		157	#define delkin_cb_resume NULL
		158	#endif
		159
113	static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = {	160	static struct pci_device_id delkin_cb_pci_tbl[] __devinitdata = {
114	{ 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},	161	{ 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
115	{ 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},	162	{ 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
Lines 122-127 static struct pci_driver delkin_cb_pci_d Link Here
122	.id_table = delkin_cb_pci_tbl,	169	.id_table = delkin_cb_pci_tbl,
123	.probe = delkin_cb_probe,	170	.probe = delkin_cb_probe,
124	.remove = delkin_cb_remove,	171	.remove = delkin_cb_remove,
		172	.suspend = delkin_cb_suspend,
		173	.resume = delkin_cb_resume,
125	};	174	};
126		175
127	static int __init delkin_cb_init(void)	176	static int __init delkin_cb_init(void)