![Tejun Heo](/assets/img/avatar_default.png)
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
264 lines
6.9 KiB
C
264 lines
6.9 KiB
C
/*
|
|
* sata_uli.c - ULi Electronics SATA
|
|
*
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*
|
|
*
|
|
* libata documentation is available via 'make {ps|pdf}docs',
|
|
* as Documentation/DocBook/libata.*
|
|
*
|
|
* Hardware documentation available under NDA.
|
|
*
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/init.h>
|
|
#include <linux/blkdev.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/device.h>
|
|
#include <scsi/scsi_host.h>
|
|
#include <linux/libata.h>
|
|
|
|
#define DRV_NAME "sata_uli"
|
|
#define DRV_VERSION "1.3"
|
|
|
|
enum {
|
|
uli_5289 = 0,
|
|
uli_5287 = 1,
|
|
uli_5281 = 2,
|
|
|
|
uli_max_ports = 4,
|
|
|
|
/* PCI configuration registers */
|
|
ULI5287_BASE = 0x90, /* sata0 phy SCR registers */
|
|
ULI5287_OFFS = 0x10, /* offset from sata0->sata1 phy regs */
|
|
ULI5281_BASE = 0x60, /* sata0 phy SCR registers */
|
|
ULI5281_OFFS = 0x60, /* offset from sata0->sata1 phy regs */
|
|
};
|
|
|
|
struct uli_priv {
|
|
unsigned int scr_cfg_addr[uli_max_ports];
|
|
};
|
|
|
|
static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
|
|
static int uli_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);
|
|
static int uli_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);
|
|
|
|
static const struct pci_device_id uli_pci_tbl[] = {
|
|
{ PCI_VDEVICE(AL, 0x5289), uli_5289 },
|
|
{ PCI_VDEVICE(AL, 0x5287), uli_5287 },
|
|
{ PCI_VDEVICE(AL, 0x5281), uli_5281 },
|
|
|
|
{ } /* terminate list */
|
|
};
|
|
|
|
static struct pci_driver uli_pci_driver = {
|
|
.name = DRV_NAME,
|
|
.id_table = uli_pci_tbl,
|
|
.probe = uli_init_one,
|
|
.remove = ata_pci_remove_one,
|
|
};
|
|
|
|
static struct scsi_host_template uli_sht = {
|
|
ATA_BMDMA_SHT(DRV_NAME),
|
|
};
|
|
|
|
static struct ata_port_operations uli_ops = {
|
|
.inherits = &ata_bmdma_port_ops,
|
|
.scr_read = uli_scr_read,
|
|
.scr_write = uli_scr_write,
|
|
.hardreset = ATA_OP_NULL,
|
|
};
|
|
|
|
static const struct ata_port_info uli_port_info = {
|
|
.flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
|
|
ATA_FLAG_IGN_SIMPLEX,
|
|
.pio_mask = ATA_PIO4,
|
|
.udma_mask = ATA_UDMA6,
|
|
.port_ops = &uli_ops,
|
|
};
|
|
|
|
|
|
MODULE_AUTHOR("Peer Chen");
|
|
MODULE_DESCRIPTION("low-level driver for ULi Electronics SATA controller");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_DEVICE_TABLE(pci, uli_pci_tbl);
|
|
MODULE_VERSION(DRV_VERSION);
|
|
|
|
static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg)
|
|
{
|
|
struct uli_priv *hpriv = ap->host->private_data;
|
|
return hpriv->scr_cfg_addr[ap->port_no] + (4 * sc_reg);
|
|
}
|
|
|
|
static u32 uli_scr_cfg_read(struct ata_link *link, unsigned int sc_reg)
|
|
{
|
|
struct pci_dev *pdev = to_pci_dev(link->ap->host->dev);
|
|
unsigned int cfg_addr = get_scr_cfg_addr(link->ap, sc_reg);
|
|
u32 val;
|
|
|
|
pci_read_config_dword(pdev, cfg_addr, &val);
|
|
return val;
|
|
}
|
|
|
|
static void uli_scr_cfg_write(struct ata_link *link, unsigned int scr, u32 val)
|
|
{
|
|
struct pci_dev *pdev = to_pci_dev(link->ap->host->dev);
|
|
unsigned int cfg_addr = get_scr_cfg_addr(link->ap, scr);
|
|
|
|
pci_write_config_dword(pdev, cfg_addr, val);
|
|
}
|
|
|
|
static int uli_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val)
|
|
{
|
|
if (sc_reg > SCR_CONTROL)
|
|
return -EINVAL;
|
|
|
|
*val = uli_scr_cfg_read(link, sc_reg);
|
|
return 0;
|
|
}
|
|
|
|
static int uli_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)
|
|
{
|
|
if (sc_reg > SCR_CONTROL) //SCR_CONTROL=2, SCR_ERROR=1, SCR_STATUS=0
|
|
return -EINVAL;
|
|
|
|
uli_scr_cfg_write(link, sc_reg, val);
|
|
return 0;
|
|
}
|
|
|
|
static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
{
|
|
static int printed_version;
|
|
const struct ata_port_info *ppi[] = { &uli_port_info, NULL };
|
|
unsigned int board_idx = (unsigned int) ent->driver_data;
|
|
struct ata_host *host;
|
|
struct uli_priv *hpriv;
|
|
void __iomem * const *iomap;
|
|
struct ata_ioports *ioaddr;
|
|
int n_ports, rc;
|
|
|
|
if (!printed_version++)
|
|
dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n");
|
|
|
|
rc = pcim_enable_device(pdev);
|
|
if (rc)
|
|
return rc;
|
|
|
|
n_ports = 2;
|
|
if (board_idx == uli_5287)
|
|
n_ports = 4;
|
|
|
|
/* allocate the host */
|
|
host = ata_host_alloc_pinfo(&pdev->dev, ppi, n_ports);
|
|
if (!host)
|
|
return -ENOMEM;
|
|
|
|
hpriv = devm_kzalloc(&pdev->dev, sizeof(*hpriv), GFP_KERNEL);
|
|
if (!hpriv)
|
|
return -ENOMEM;
|
|
host->private_data = hpriv;
|
|
|
|
/* the first two ports are standard SFF */
|
|
rc = ata_pci_sff_init_host(host);
|
|
if (rc)
|
|
return rc;
|
|
|
|
rc = ata_pci_bmdma_init(host);
|
|
if (rc)
|
|
return rc;
|
|
|
|
iomap = host->iomap;
|
|
|
|
switch (board_idx) {
|
|
case uli_5287:
|
|
/* If there are four, the last two live right after
|
|
* the standard SFF ports.
|
|
*/
|
|
hpriv->scr_cfg_addr[0] = ULI5287_BASE;
|
|
hpriv->scr_cfg_addr[1] = ULI5287_BASE + ULI5287_OFFS;
|
|
|
|
ioaddr = &host->ports[2]->ioaddr;
|
|
ioaddr->cmd_addr = iomap[0] + 8;
|
|
ioaddr->altstatus_addr =
|
|
ioaddr->ctl_addr = (void __iomem *)
|
|
((unsigned long)iomap[1] | ATA_PCI_CTL_OFS) + 4;
|
|
ioaddr->bmdma_addr = iomap[4] + 16;
|
|
hpriv->scr_cfg_addr[2] = ULI5287_BASE + ULI5287_OFFS*4;
|
|
ata_sff_std_ports(ioaddr);
|
|
|
|
ata_port_desc(host->ports[2],
|
|
"cmd 0x%llx ctl 0x%llx bmdma 0x%llx",
|
|
(unsigned long long)pci_resource_start(pdev, 0) + 8,
|
|
((unsigned long long)pci_resource_start(pdev, 1) | ATA_PCI_CTL_OFS) + 4,
|
|
(unsigned long long)pci_resource_start(pdev, 4) + 16);
|
|
|
|
ioaddr = &host->ports[3]->ioaddr;
|
|
ioaddr->cmd_addr = iomap[2] + 8;
|
|
ioaddr->altstatus_addr =
|
|
ioaddr->ctl_addr = (void __iomem *)
|
|
((unsigned long)iomap[3] | ATA_PCI_CTL_OFS) + 4;
|
|
ioaddr->bmdma_addr = iomap[4] + 24;
|
|
hpriv->scr_cfg_addr[3] = ULI5287_BASE + ULI5287_OFFS*5;
|
|
ata_sff_std_ports(ioaddr);
|
|
|
|
ata_port_desc(host->ports[2],
|
|
"cmd 0x%llx ctl 0x%llx bmdma 0x%llx",
|
|
(unsigned long long)pci_resource_start(pdev, 2) + 9,
|
|
((unsigned long long)pci_resource_start(pdev, 3) | ATA_PCI_CTL_OFS) + 4,
|
|
(unsigned long long)pci_resource_start(pdev, 4) + 24);
|
|
|
|
break;
|
|
|
|
case uli_5289:
|
|
hpriv->scr_cfg_addr[0] = ULI5287_BASE;
|
|
hpriv->scr_cfg_addr[1] = ULI5287_BASE + ULI5287_OFFS;
|
|
break;
|
|
|
|
case uli_5281:
|
|
hpriv->scr_cfg_addr[0] = ULI5281_BASE;
|
|
hpriv->scr_cfg_addr[1] = ULI5281_BASE + ULI5281_OFFS;
|
|
break;
|
|
|
|
default:
|
|
BUG();
|
|
break;
|
|
}
|
|
|
|
pci_set_master(pdev);
|
|
pci_intx(pdev, 1);
|
|
return ata_host_activate(host, pdev->irq, ata_sff_interrupt,
|
|
IRQF_SHARED, &uli_sht);
|
|
}
|
|
|
|
static int __init uli_init(void)
|
|
{
|
|
return pci_register_driver(&uli_pci_driver);
|
|
}
|
|
|
|
static void __exit uli_exit(void)
|
|
{
|
|
pci_unregister_driver(&uli_pci_driver);
|
|
}
|
|
|
|
|
|
module_init(uli_init);
|
|
module_exit(uli_exit);
|