Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux (15f8e733) · Commits · 戴 / test

drivers/pcmcia/i82092.c

+311 −337

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@

		#include <pcmcia/ss.h>

		#include <asm/io.h>
		#include <linux/io.h>

		#include "i82092aa.h"
		#include "i82365.h"
		@@ -53,10 +53,12 @@ static struct pccard_operations i82092aa_operations = {

		struct socket_info {
		int number;
		int card_state; /* 0 = no socket,
		1 = empty socket,
		2 = card but not initialized,
		3 = operational card */
		int card_state;
		/* 0 = no socket,
		* 1 = empty socket,
		* 2 = card but not initialized,
		* 3 = operational card
		*/
		unsigned int io_base; /* base io address of the socket */

		struct pcmcia_socket socket;
		@@ -68,17 +70,19 @@ static struct socket_info sockets[MAX_SOCKETS];
		static int socket_count; /* shortcut */


		static int i82092aa_pci_probe(struct pci_dev dev, const struct pci_device_id id)
		static int i82092aa_pci_probe(struct pci_dev *dev,
		const struct pci_device_id *id)
		{
		unsigned char configbyte;
		int i, ret;

		enter("i82092aa_pci_probe");

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

		pci_read_config_byte(dev, 0x40, &configbyte); /* PCI Configuration Control */
		/* PCI Configuration Control */
		pci_read_config_byte(dev, 0x40, &configbyte);

		switch (configbyte&6) {
		case 0:
		socket_count = 2;
		@@ -92,11 +96,13 @@ static int i82092aa_pci_probe(struct pci_dev dev, const struct pci_device_id i
		break;

		default:
		printk(KERN_ERR "i82092aa: Oops, you did something we didn't think of.\n");
		dev_err(&dev->dev,
		"Oops, you did something we didn't think of.\n");
		ret = -EIO;
		goto err_out_disable;
		}
		printk(KERN_INFO "i82092aa: configured as a %d socket device.\n", socket_count);
		dev_info(&dev->dev, "configured as a %d socket device.\n",
		socket_count);

		if (!request_region(pci_resource_start(dev, 0), 2, "i82092aa")) {
		ret = -EBUSY;
		@@ -117,20 +123,27 @@ static int i82092aa_pci_probe(struct pci_dev dev, const struct pci_device_id i

		if (card_present(i)) {
		sockets[i].card_state = 3;
		dev_dbg(&dev->dev, "i82092aa: slot %i is occupied\n", i);
		dev_dbg(&dev->dev, "slot %i is occupied\n", i);
		} else {
		dev_dbg(&dev->dev, "i82092aa: slot %i is vacant\n", i);
		dev_dbg(&dev->dev, "slot %i is vacant\n", i);
		}
		}

		/* Now, specifiy that all interrupts are to be done as PCI interrupts */
		configbyte = 0xFF; /* bitmask, one bit per event, 1 = PCI interrupt, 0 = ISA interrupt */
		pci_write_config_byte(dev, 0x50, configbyte); /* PCI Interrupt Routing Register */
		/* Now, specifiy that all interrupts are to be done as PCI interrupts
		* bitmask, one bit per event, 1 = PCI interrupt, 0 = ISA interrupt
		*/
		configbyte = 0xFF;

		/* PCI Interrupt Routing Register */
		pci_write_config_byte(dev, 0x50, configbyte);

		/* Register the interrupt handler */
		dev_dbg(&dev->dev, "Requesting interrupt %i\n", dev->irq);
		if ((ret = request_irq(dev->irq, i82092aa_interrupt, IRQF_SHARED, "i82092aa", i82092aa_interrupt))) {
		printk(KERN_ERR "i82092aa: Failed to register IRQ %d, aborting\n", dev->irq);
		ret = request_irq(dev->irq, i82092aa_interrupt, IRQF_SHARED,
		"i82092aa", i82092aa_interrupt);
		if (ret) {
		dev_err(&dev->dev, "Failed to register IRQ %d, aborting\n",
		dev->irq);
		goto err_out_free_res;
		}

		@@ -139,20 +152,17 @@ static int i82092aa_pci_probe(struct pci_dev dev, const struct pci_device_id i
		sockets[i].socket.ops = &i82092aa_operations;
		sockets[i].socket.resource_ops = &pccard_nonstatic_ops;
		ret = pcmcia_register_socket(&sockets[i].socket);
		if (ret) {
		if (ret)
		goto err_out_free_sockets;
		}
		}

		leave("i82092aa_pci_probe");
		return 0;

		err_out_free_sockets:
		if (i) {
		for (i--;i>=0;i--) {
		for (i--; i >= 0; i--)
		pcmcia_unregister_socket(&sockets[i].socket);
		}
		}
		free_irq(dev->irq, i82092aa_interrupt);
		err_out_free_res:
		release_region(pci_resource_start(dev, 0), 2);
		@@ -165,14 +175,10 @@ static void i82092aa_pci_remove(struct pci_dev *dev)
		{
		int i;

		enter("i82092aa_pci_remove");

		free_irq(dev->irq, i82092aa_interrupt);

		for (i = 0; i < socket_count; i++)
		pcmcia_unregister_socket(&sockets[i].socket);

		leave("i82092aa_pci_remove");
		}

		static DEFINE_SPINLOCK(port_lock);
		@@ -184,6 +190,7 @@ static unsigned char indirect_read(int socket, unsigned short reg)
		unsigned short int port;
		unsigned char val;
		unsigned long flags;

		spin_lock_irqsave(&port_lock, flags);
		reg += socket * 0x40;
		port = sockets[socket].io_base;
		@@ -193,29 +200,11 @@ static unsigned char indirect_read(int socket, unsigned short reg)
		return val;
		}

		#if 0
		static unsigned short indirect_read16(int socket, unsigned short reg)
		{
		unsigned short int port;
		unsigned short tmp;
		unsigned long flags;
		spin_lock_irqsave(&port_lock,flags);
		reg = reg + socket * 0x40;
		port = sockets[socket].io_base;
		outb(reg,port);
		tmp = inb(port+1);
		reg++;
		outb(reg,port);
		tmp = tmp \| (inb(port+1)<<8);
		spin_unlock_irqrestore(&port_lock,flags);
		return tmp;
		}
		#endif

		static void indirect_write(int socket, unsigned short reg, unsigned char value)
		{
		unsigned short int port;
		unsigned long flags;

		spin_lock_irqsave(&port_lock, flags);
		reg = reg + socket * 0x40;
		port = sockets[socket].io_base;
		@@ -229,6 +218,7 @@ static void indirect_setbit(int socket, unsigned short reg, unsigned char mask)
		unsigned short int port;
		unsigned char val;
		unsigned long flags;

		spin_lock_irqsave(&port_lock, flags);
		reg = reg + socket * 0x40;
		port = sockets[socket].io_base;
		@@ -241,11 +231,13 @@ static void indirect_setbit(int socket, unsigned short reg, unsigned char mask)
		}


		static void indirect_resetbit(int socket, unsigned short reg, unsigned char mask)
		static void indirect_resetbit(int socket,
		unsigned short reg, unsigned char mask)
		{
		unsigned short int port;
		unsigned char val;
		unsigned long flags;

		spin_lock_irqsave(&port_lock, flags);
		reg = reg + socket * 0x40;
		port = sockets[socket].io_base;
		@@ -257,11 +249,13 @@ static void indirect_resetbit(int socket, unsigned short reg, unsigned char mask
		spin_unlock_irqrestore(&port_lock, flags);
		}

		static void indirect_write16(int socket, unsigned short reg, unsigned short value)
		static void indirect_write16(int socket,
		unsigned short reg, unsigned short value)
		{
		unsigned short int port;
		unsigned char val;
		unsigned long flags;

		spin_lock_irqsave(&port_lock, flags);
		reg = reg + socket * 0x40;
		port = sockets[socket].io_base;
		@@ -301,12 +295,10 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)

		unsigned int events, active = 0;

		/* enter("i82092aa_interrupt");*/

		while (1) {
		loopcount++;
		if (loopcount > 20) {
		printk(KERN_ERR "i82092aa: infinite eventloop in interrupt \n");
		pr_err("i82092aa: infinite eventloop in interrupt\n");
		break;
		}

		@@ -314,10 +306,13 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)

		for (i = 0; i < socket_count; i++) {
		int csc;
		if (sockets[i].card_state==0) /* Inactive socket, should not happen */

		/* Inactive socket, should not happen */
		if (sockets[i].card_state == 0)
		continue;

		csc = indirect_read(i,I365_CSC); /* card status change register */
		/* card status change register */
		csc = indirect_read(i, I365_CSC);

		if (csc == 0) /* no events on this socket */
		continue;
		@@ -326,31 +321,33 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)

		if (csc & I365_CSC_DETECT) {
		events \|= SS_DETECT;
		printk("Card detected in socket %i!\n",i);
		dev_info(&sockets[i].dev->dev,
		"Card detected in socket %i!\n", i);
		}

		if (indirect_read(i, I365_INTCTL) & I365_PC_IOCARD) {
		/* For IO/CARDS, bit 0 means "read the card" */
		events \|= (csc & I365_CSC_STSCHG) ? SS_STSCHG : 0;
		if (csc & I365_CSC_STSCHG)
		events \|= SS_STSCHG;
		} else {
		/* Check for battery/ready events */
		events \|= (csc & I365_CSC_BVD1) ? SS_BATDEAD : 0;
		events \|= (csc & I365_CSC_BVD2) ? SS_BATWARN : 0;
		events \|= (csc & I365_CSC_READY) ? SS_READY : 0;
		if (csc & I365_CSC_BVD1)
		events \|= SS_BATDEAD;
		if (csc & I365_CSC_BVD2)
		events \|= SS_BATWARN;
		if (csc & I365_CSC_READY)
		events \|= SS_READY;
		}

		if (events) {
		if (events)
		pcmcia_parse_events(&sockets[i].socket, events);
		}
		active \|= events;
		}

		if (active == 0) /* no more events to handle */
		break;

		}
		return IRQ_RETVAL(handled);
		/* leave("i82092aa_interrupt");*/
		}


		@@ -360,7 +357,6 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)
		static int card_present(int socketno)
		{
		unsigned int val;
		enter("card_present");

		if ((socketno < 0) \|\| (socketno >= MAX_SOCKETS))
		return 0;
		@@ -369,30 +365,21 @@ static int card_present(int socketno)


		val = indirect_read(socketno, 1); /* Interface status register */
		if ((val&12)==12) {
		leave("card_present 1");
		if ((val&12) == 12)
		return 1;
		}

		leave("card_present 0");
		return 0;
		}

		static void set_bridge_state(int sock)
		{
		enter("set_bridge_state");
		indirect_write(sock, I365_GBLCTL, 0x00);
		indirect_write(sock, I365_GENCTL, 0x00);

		indirect_setbit(sock, I365_INTCTL, 0x08);
		leave("set_bridge_state");
		}






		static int i82092aa_init(struct pcmcia_socket *sock)
		{
		int i;
		@@ -400,8 +387,6 @@ static int i82092aa_init(struct pcmcia_socket *sock)
		pccard_io_map io = { 0, 0, 0, 0, 1 };
		pccard_mem_map mem = { .res = &res, };

		enter("i82092aa_init");

		for (i = 0; i < 2; i++) {
		io.map = i;
		i82092aa_set_io_map(sock, &io);
		@@ -411,23 +396,22 @@ static int i82092aa_init(struct pcmcia_socket *sock)
		i82092aa_set_mem_map(sock, &mem);
		}

		leave("i82092aa_init");
		return 0;
		}

		static int i82092aa_get_status(struct pcmcia_socket socket, u_int value)
		{
		unsigned int sock = container_of(socket, struct socket_info, socket)->number;
		unsigned int sock = container_of(socket,
		struct socket_info, socket)->number;
		unsigned int status;

		enter("i82092aa_get_status");
		/* Interface Status Register */
		status = indirect_read(sock, I365_STATUS);

		status = indirect_read(sock,I365_STATUS); /* Interface Status Register */
		*value = 0;

		if ((status & I365_CS_DETECT) == I365_CS_DETECT) {
		if ((status & I365_CS_DETECT) == I365_CS_DETECT)
		*value \|= SS_DETECT;
		}

		/* IO cards have a different meaning of bits 0,1 */
		/* Also notice the inverse-logic on the bits */
		@@ -451,18 +435,18 @@ static int i82092aa_get_status(struct pcmcia_socket socket, u_int value)
		if (status & I365_CS_POWERON)
		(value) \|= SS_POWERON; / power is applied to the card */

		leave("i82092aa_get_status");
		return 0;
		}


		static int i82092aa_set_socket(struct pcmcia_socket socket, socket_state_t state)
		static int i82092aa_set_socket(struct pcmcia_socket *socket,
		socket_state_t *state)
		{
		unsigned int sock = container_of(socket, struct socket_info, socket)->number;
		struct socket_info *sock_info = container_of(socket, struct socket_info,
		socket);
		unsigned int sock = sock_info->number;
		unsigned char reg;

		enter("i82092aa_set_socket");

		/* First, set the global controller options */

		set_bridge_state(sock);
		@@ -470,23 +454,26 @@ static int i82092aa_set_socket(struct pcmcia_socket socket, socket_state_t sta
		/* Values for the IGENC register */

		reg = 0;
		if (!(state->flags & SS_RESET)) /* The reset bit has "inverse" logic */

		/* The reset bit has "inverse" logic */
		if (!(state->flags & SS_RESET))
		reg = reg \| I365_PC_RESET;
		if (state->flags & SS_IOCARD)
		reg = reg \| I365_PC_IOCARD;

		indirect_write(sock,I365_INTCTL,reg); /* IGENC, Interrupt and General Control Register */
		/* IGENC, Interrupt and General Control Register */
		indirect_write(sock, I365_INTCTL, reg);

		/* Power registers */

		reg = I365_PWR_NORESET; /* default: disable resetdrv on resume */

		if (state->flags & SS_PWR_AUTO) {
		printk("Auto power\n");
		dev_info(&sock_info->dev->dev, "Auto power\n");
		reg \|= I365_PWR_AUTO; /* automatic power mngmnt */
		}
		if (state->flags & SS_OUTPUT_ENA) {
		printk("Power Enabled \n");
		dev_info(&sock_info->dev->dev, "Power Enabled\n");
		reg \|= I365_PWR_OUT; /* enable power */
		}

		@@ -494,31 +481,36 @@ static int i82092aa_set_socket(struct pcmcia_socket socket, socket_state_t sta
		case 0:
		break;
		case 50:
		printk("setting voltage to Vcc to 5V on socket %i\n",sock);
		dev_info(&sock_info->dev->dev,
		"setting voltage to Vcc to 5V on socket %i\n",
		sock);
		reg \|= I365_VCC_5V;
		break;
		default:
		printk("i82092aa: i82092aa_set_socket called with invalid VCC power value: %i ", state->Vcc);
		leave("i82092aa_set_socket");
		dev_err(&sock_info->dev->dev,
		"%s called with invalid VCC power value: %i",
		__func__, state->Vcc);
		return -EINVAL;
		}


		switch (state->Vpp) {
		case 0:
		printk("not setting Vpp on socket %i\n",sock);
		dev_info(&sock_info->dev->dev,
		"not setting Vpp on socket %i\n", sock);
		break;
		case 50:
		printk("setting Vpp to 5.0 for socket %i\n",sock);
		dev_info(&sock_info->dev->dev,
		"setting Vpp to 5.0 for socket %i\n", sock);
		reg \|= I365_VPP1_5V \| I365_VPP2_5V;
		break;
		case 120:
		printk("setting Vpp to 12.0\n");
		dev_info(&sock_info->dev->dev, "setting Vpp to 12.0\n");
		reg \|= I365_VPP1_12V \| I365_VPP2_12V;
		break;
		default:
		printk("i82092aa: i82092aa_set_socket called with invalid VPP power value: %i ", state->Vcc);
		leave("i82092aa_set_socket");
		dev_err(&sock_info->dev->dev,
		"%s called with invalid VPP power value: %i",
		__func__, state->Vcc);
		return -EINVAL;
		}

		@@ -528,9 +520,8 @@ static int i82092aa_set_socket(struct pcmcia_socket socket, socket_state_t sta
		/* Enable specific interrupt events */

		reg = 0x00;
		if (state->csc_mask & SS_DETECT) {
		if (state->csc_mask & SS_DETECT)
		reg \|= I365_CSC_DETECT;
		}
		if (state->flags & SS_IOCARD) {
		if (state->csc_mask & SS_STSCHG)
		reg \|= I365_CSC_STSCHG;
		@@ -544,40 +535,38 @@ static int i82092aa_set_socket(struct pcmcia_socket socket, socket_state_t sta

		}

		/* now write the value and clear the (probably bogus) pending stuff by doing a dummy read*/
		/* now write the value and clear the (probably bogus) pending stuff
		* by doing a dummy read
		*/

		indirect_write(sock, I365_CSCINT, reg);
		(void)indirect_read(sock, I365_CSC);

		leave("i82092aa_set_socket");
		return 0;
		}

		static int i82092aa_set_io_map(struct pcmcia_socket socket, struct pccard_io_map io)
		static int i82092aa_set_io_map(struct pcmcia_socket *socket,
		struct pccard_io_map *io)
		{
		unsigned int sock = container_of(socket, struct socket_info, socket)->number;
		struct socket_info *sock_info = container_of(socket, struct socket_info,
		socket);
		unsigned int sock = sock_info->number;
		unsigned char map, ioctl;

		enter("i82092aa_set_io_map");

		map = io->map;

		/* Check error conditions */
		if (map > 1) {
		leave("i82092aa_set_io_map with invalid map");
		if (map > 1)
		return -EINVAL;
		}
		if ((io->start > 0xffff) \|\| (io->stop > 0xffff) \|\| (io->stop < io->start)){
		leave("i82092aa_set_io_map with invalid io");

		if ((io->start > 0xffff) \|\| (io->stop > 0xffff)
		\|\| (io->stop < io->start))
		return -EINVAL;
		}

		/* Turn off the window before changing anything */
		if (indirect_read(sock, I365_ADDRWIN) & I365_ENA_IO(map))
		indirect_resetbit(sock, I365_ADDRWIN, I365_ENA_IO(map));

		/* printk("set_io_map: Setting range to %x - %x \n",io->start,io->stop); */

		/* write the new values */
		indirect_write16(sock, I365_IO(map)+I365_W_START, io->start);
		indirect_write16(sock, I365_IO(map)+I365_W_STOP, io->stop);
		@@ -593,34 +582,29 @@ static int i82092aa_set_io_map(struct pcmcia_socket *socket, struct pccard_io_ma
		if (io->flags & MAP_ACTIVE)
		indirect_setbit(sock, I365_ADDRWIN, I365_ENA_IO(map));

		leave("i82092aa_set_io_map");
		return 0;
		}

		static int i82092aa_set_mem_map(struct pcmcia_socket socket, struct pccard_mem_map mem)
		static int i82092aa_set_mem_map(struct pcmcia_socket *socket,
		struct pccard_mem_map *mem)
		{
		struct socket_info *sock_info = container_of(socket, struct socket_info, socket);
		struct socket_info *sock_info = container_of(socket, struct socket_info,
		socket);
		unsigned int sock = sock_info->number;
		struct pci_bus_region region;
		unsigned short base, i;
		unsigned char map;

		enter("i82092aa_set_mem_map");

		pcibios_resource_to_bus(sock_info->dev->bus, &region, mem->res);

		map = mem->map;
		if (map > 4) {
		leave("i82092aa_set_mem_map: invalid map");
		if (map > 4)
		return -EINVAL;
		}


		if ((mem->card_start > 0x3ffffff) \|\| (region.start > region.end) \|\|
		(mem->speed > 1000)) {
		leave("i82092aa_set_mem_map: invalid address / speed");
		printk("invalid mem map for socket %i: %llx to %llx with a "
		"start of %x\n",
		dev_err(&sock_info->dev->dev,
		"invalid mem map for socket %i: %llx to %llx with a start of %x\n",
		sock,
		(unsigned long long)region.start,
		(unsigned long long)region.end,
		@@ -632,9 +616,6 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_
		if (indirect_read(sock, I365_ADDRWIN) & I365_ENA_MEM(map))
		indirect_resetbit(sock, I365_ADDRWIN, I365_ENA_MEM(map));


		/* printk("set_mem_map: Setting map %i range to %x - %x on socket %i, speed is %i, active = %i \n",map, region.start,region.end,sock,mem->speed,mem->flags & MAP_ACTIVE); */

		/* write the start address */
		base = I365_MEM(map);
		i = (region.start >> 12) & 0x0fff;
		@@ -668,19 +649,14 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_
		i = ((mem->card_start - region.start) >> 12) & 0x3fff;
		if (mem->flags & MAP_WRPROT)
		i \|= I365_MEM_WRPROT;
		if (mem->flags & MAP_ATTRIB) {
		/* printk("requesting attribute memory for socket %i\n",sock);*/
		if (mem->flags & MAP_ATTRIB)
		i \|= I365_MEM_REG;
		} else {
		/* printk("requesting normal memory for socket %i\n",sock);*/
		}
		indirect_write16(sock, base+I365_W_OFF, i);

		/* Enable the window if necessary */
		if (mem->flags & MAP_ACTIVE)
		indirect_setbit(sock, I365_ADDRWIN, I365_ENA_MEM(map));

		leave("i82092aa_set_mem_map");
		return 0;
		}

		@@ -691,11 +667,9 @@ static int i82092aa_module_init(void)

		static void i82092aa_module_exit(void)
		{
		enter("i82092aa_module_exit");
		pci_unregister_driver(&i82092aa_pci_driver);
		if (sockets[0].io_base > 0)
		release_region(sockets[0].io_base, 2);
		leave("i82092aa_module_exit");
		}

		module_init(i82092aa_module_init);

drivers/pcmcia/i82092aa.h

+0 −11

Original line number	Diff line number	Diff line
		@@ -4,17 +4,6 @@

		#include <linux/interrupt.h>

		/* Debuging defines */
		#ifdef NOTRACE
		#define enter(x) printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__)
		#define leave(x) printk("Leave: %s, %s line %i\n",x,__FILE__,__LINE__)
		#else
		#define enter(x) do {} while (0)
		#define leave(x) do {} while (0)
		#endif



		/* prototypes */

		static int i82092aa_pci_probe(struct pci_dev dev, const struct pci_device_id id);

Admin message