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

Commit 00990e7c authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: use autoconfiguration feature for ioports and iomem 



When CONF_AUTO_SET_IO or CONF_AUTO_SET_IOMEM are set, the corresponding
fields in struct pcmcia_device *p_dev->resource[0,1,2] are set
accordinly. Drivers wishing to override certain settings may do so in
the callback function, but they no longer need to parse the CIS entries
stored in cistpl_cftable_entry_t themselves.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: linux-bluetooth@vger.kernel.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
CC: linux-scsi@vger.kernel.org
Tested-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 440eed43

Documentation/pcmcia/driver-changes.txt

+12 −0
Original line number Diff line number Diff line 
This file details changes in 2.6 which affect PCMCIA card driver authors:

* pcmcia_loop_config() and autoconfiguration (as of 2.6.36)

   If struct pcmcia_device *p_dev->config_flags is set accordingly,

   pcmcia_loop_config() now sets up certain configuration values

   automatically, though the driver may still override the settings

   in the callback function. The following autoconfiguration options

   are provided at the moment:

	CONF_AUTO_CHECK_VCC : check for matching Vcc

	CONF_AUTO_SET_VPP   : set Vpp

	CONF_AUTO_AUDIO     : auto-enable audio line, if required

	CONF_AUTO_SET_IO    : set ioport resources (->resource[0,1])

	CONF_AUTO_SET_IOMEM : set first iomem resource (->resource[2])



* pcmcia_request_configuration -> pcmcia_enable_device (as of 2.6.36)

   pcmcia_request_configuration() got renamed to pcmcia_enable_device(),

   as it mirrors pcmcia_disable_device(). Configuration settings are now

drivers/ata/pata_pcmcia.c

+26 −55
Original line number Diff line number Diff line
@@ -167,45 +167,26 @@ static struct ata_port_operations pcmcia_8bit_port_ops = { 
};





struct pcmcia_config_check {

	unsigned long ctl_base;

	int is_kme;

};



static int pcmcia_check_one_config(struct pcmcia_device *pdev,

				   cistpl_cftable_entry_t *cfg,

				   cistpl_cftable_entry_t *dflt,

				   void *priv_data)

static int pcmcia_check_one_config(struct pcmcia_device *pdev, void *priv_data)

{

	struct pcmcia_config_check *stk = priv_data;

	int *is_kme = priv_data;



	if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {

		cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;

		pdev->io_lines = io->flags & CISTPL_IO_LINES_MASK;

		pdev->resource[0]->start = io->win[0].base;

		if (!(io->flags & CISTPL_IO_16BIT)) {

	if (!(pdev->resource[0]->flags & IO_DATA_PATH_WIDTH_8)) {

		pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;

			pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;

		pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;

	}

		if (io->nwin == 2) {

	pdev->resource[1]->flags &= ~IO_DATA_PATH_WIDTH;

	pdev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;



	if (pdev->resource[1]->end) {

		pdev->resource[0]->end = 8;

			pdev->resource[1]->start = io->win[1].base;

			pdev->resource[1]->end = (stk->is_kme) ? 2 : 1;

			if (pcmcia_request_io(pdev) != 0)

				return -ENODEV;

			stk->ctl_base = pdev->resource[1]->start;

		} else if ((io->nwin == 1) && (io->win[0].len >= 16)) {

			pdev->resource[0]->end = io->win[0].len;

			pdev->resource[1]->end = 0;

			if (pcmcia_request_io(pdev) != 0)

		pdev->resource[1]->end = (*is_kme) ? 2 : 1;

	} else {

		if (pdev->resource[0]->end < 16)

			return -ENODEV;

			stk->ctl_base = pdev->resource[0]->start + 0x0e;

		} else

			return -ENODEV;

		/* If we've got this far, we're done */

		return 0;

	}

	return -ENODEV;



	return pcmcia_request_io(pdev);

}



/**
@@ -220,7 +201,6 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) 
{

	struct ata_host *host;

	struct ata_port *ap;

	struct pcmcia_config_check *stk = NULL;

	int is_kme = 0, ret = -ENOMEM, p;

	unsigned long io_base, ctl_base;

	void __iomem *io_addr, *ctl_addr;
@@ -228,10 +208,8 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) 
	struct ata_port_operations *ops = &pcmcia_port_ops;



	/* Set up attributes in order to probe card and get resources */

	pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;

	pdev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;

	pdev->config_flags |= CONF_ENABLE_IRQ;

	pdev->config_flags |= CONF_AUTO_SET_VPP | CONF_AUTO_CHECK_VCC;

	pdev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO |

		CONF_AUTO_SET_VPP | CONF_AUTO_CHECK_VCC;



	/* See if we have a manufacturer identifier. Use it to set is_kme for

	   vendor quirks */
@@ -239,21 +217,17 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) 
		  ((pdev->card_id == PRODID_KME_KXLC005_A) ||

		   (pdev->card_id == PRODID_KME_KXLC005_B)));



	/* Allocate resoure probing structures */



	stk = kzalloc(sizeof(*stk), GFP_KERNEL);

	if (!stk)

		goto out1;

	stk->is_kme = is_kme;

	io_base = ctl_base = 0;



	if (pcmcia_loop_config(pdev, pcmcia_check_one_config, stk)) {

	if (pcmcia_loop_config(pdev, pcmcia_check_one_config, &is_kme)) {

		pdev->config_flags &= ~CONF_AUTO_CHECK_VCC;

		if (pcmcia_loop_config(pdev, pcmcia_check_one_config, stk))

		if (pcmcia_loop_config(pdev, pcmcia_check_one_config, &is_kme))

			goto failed; /* No suitable config found */

	}

	io_base = pdev->resource[0]->start;

	ctl_base = stk->ctl_base;

	if (pdev->resource[1]->end)

		ctl_base = pdev->resource[1]->start;

	else

		ctl_base = pdev->resource[0]->start + 0x0e;



	if (!pdev->irq)

		goto failed;
@@ -310,13 +284,10 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) 
		goto failed;



	pdev->priv = host;

	kfree(stk);

	return 0;



failed:

	kfree(stk);

	pcmcia_disable_device(pdev);

out1:

	return ret;

}

drivers/bluetooth/bt3c_cs.c

+27 −26
Original line number Diff line number Diff line
@@ -656,10 +656,8 @@ static int bt3c_probe(struct pcmcia_device *link) 
	info->p_dev = link;

	link->priv = info;



	link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;

	link->resource[0]->end = 8;



	link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_VPP;

	link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_VPP |

		CONF_AUTO_SET_IO;



	return bt3c_config(link);

}
@@ -673,39 +671,42 @@ static void bt3c_detach(struct pcmcia_device *link) 
	kfree(info);

}



static int bt3c_check_config(struct pcmcia_device *p_dev,

			     cistpl_cftable_entry_t *cf,

			     cistpl_cftable_entry_t *dflt,

			     void *priv_data)

static int bt3c_check_config(struct pcmcia_device *p_dev, void *priv_data)

{

	unsigned long try = (unsigned long) priv_data;

	p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;

	int *try = priv_data;



	if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&

	    (cf->io.win[0].base != 0)) {

		p_dev->resource[0]->start = cf->io.win[0].base;

		if (!pcmcia_request_io(p_dev))

			return 0;

	}

	return -ENODEV;

	if (try == 0)

		p_dev->io_lines = 16;



	if ((p_dev->resource[0]->end != 8) || (p_dev->resource[0]->start == 0))

		return -EINVAL;



	p_dev->resource[0]->end = 8;

	p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;

	p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;



	return pcmcia_request_io(p_dev);

}



static int bt3c_check_config_notpicky(struct pcmcia_device *p_dev,

				      cistpl_cftable_entry_t *cf,

				      cistpl_cftable_entry_t *dflt,

				      void *priv_data)

{

	static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };

	int j;



	if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {

	if (p_dev->io_lines > 3)

		return -ENODEV;



	p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;

	p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;

	p_dev->resource[0]->end = 8;



	for (j = 0; j < 5; j++) {

		p_dev->resource[0]->start = base[j];

		p_dev->io_lines = base[j] ? 16 : 3;

		if (!pcmcia_request_io(p_dev))

			return 0;

	}

	}

	return -ENODEV;

}

drivers/bluetooth/btuart_cs.c

+26 −25
Original line number Diff line number Diff line
@@ -585,10 +585,8 @@ static int btuart_probe(struct pcmcia_device *link) 
	info->p_dev = link;

	link->priv = info;



	link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;

	link->resource[0]->end = 8;



	link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_VPP;

	link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_VPP |

		CONF_AUTO_SET_IO;



	return btuart_config(link);

}
@@ -602,39 +600,42 @@ static void btuart_detach(struct pcmcia_device *link) 
	kfree(info);

}



static int btuart_check_config(struct pcmcia_device *p_dev,

			       cistpl_cftable_entry_t *cf,

			       cistpl_cftable_entry_t *dflt,

			       void *priv_data)

static int btuart_check_config(struct pcmcia_device *p_dev, void *priv_data)

{

	int *try = priv_data;

	p_dev->io_lines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;



	if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) &&

	    (cf->io.win[0].base != 0)) {

		p_dev->resource[0]->start = cf->io.win[0].base;

		if (!pcmcia_request_io(p_dev))

			return 0;

	}

	return -ENODEV;

	if (try == 0)

		p_dev->io_lines = 16;



	if ((p_dev->resource[0]->end != 8) || (p_dev->resource[0]->start == 0))

		return -EINVAL;



	p_dev->resource[0]->end = 8;

	p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;

	p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;



	return pcmcia_request_io(p_dev);

}



static int btuart_check_config_notpicky(struct pcmcia_device *p_dev,

					cistpl_cftable_entry_t *cf,

					cistpl_cftable_entry_t *dflt,

					void *priv_data)

{

	static unsigned int base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };

	int j;



	if ((cf->io.nwin > 0) && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {

	if (p_dev->io_lines > 3)

		return -ENODEV;



	p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;

	p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;

	p_dev->resource[0]->end = 8;



	for (j = 0; j < 5; j++) {

		p_dev->resource[0]->start = base[j];

		p_dev->io_lines = base[j] ? 16 : 3;

		if (!pcmcia_request_io(p_dev))

			return 0;

	}

	}

	return -ENODEV;

}

drivers/bluetooth/dtl1_cs.c

+6 −12
Original line number Diff line number Diff line
@@ -571,10 +571,7 @@ static int dtl1_probe(struct pcmcia_device *link) 
	info->p_dev = link;

	link->priv = info;



	link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;

	link->resource[0]->end = 8;



	link->config_flags |= CONF_ENABLE_IRQ;

	link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;



	return dtl1_config(link);

}
@@ -589,17 +586,14 @@ static void dtl1_detach(struct pcmcia_device *link) 
	kfree(info);

}



static int dtl1_confcheck(struct pcmcia_device *p_dev,

			  cistpl_cftable_entry_t *cf,

			  cistpl_cftable_entry_t *dflt,

			  void *priv_data)

static int dtl1_confcheck(struct pcmcia_device *p_dev, void *priv_data)

{

	if ((cf->io.nwin != 1) || (cf->io.win[0].len <= 8))

	if ((p_dev->resource[1]->end) || (p_dev->resource[1]->end < 8))

		return -ENODEV;



	p_dev->resource[0]->start = cf->io.win[0].base;

	p_dev->resource[0]->end = cf->io.win[0].len;	/*yo */

	p_dev->io_lines = cf->io.flags & CISTPL_IO_LINES_MASK;

	p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;

	p_dev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;



	return pcmcia_request_io(p_dev);

}