From mboxrd@z Thu Jan 1 00:00:00 1970 From: Uwe Koziolek Subject: Hotfix for SIS 964 with disabled sata ports. Date: Mon, 19 Apr 2004 09:34:05 +0200 Sender: linux-ide-owner@vger.kernel.org Message-ID: <1082360045.721.27.camel@uk2.local> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-LqvLeWWndYksy1jxnHk0" Return-path: Received: from pop.gmx.de ([213.165.64.20]:5346 "HELO mail.gmx.net") by vger.kernel.org with SMTP id S263606AbUDSHdJ (ORCPT ); Mon, 19 Apr 2004 03:33:09 -0400 List-Id: linux-ide@vger.kernel.org To: =?ISO-8859-1?Q?K=F3sa?= Ferenc , Lapo Sergi , jgarzik@pobox.com, Daniela Engert , linux-ide@vger.kernel.org --=-LqvLeWWndYksy1jxnHk0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Hello, some motherboards with SIS964 a working with disabled sata ports. These boards does not work with the actual sata_sis.c. Because i dont know how to enable the sata ports, i provide a hotfix using this boards in pata compatibility mode. This is not the final code. regards Uwe Koziolek --=-LqvLeWWndYksy1jxnHk0 Content-Disposition: attachment; filename=sata_sis.c Content-Type: text/x-c; name=sata_sis.c; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit /* * sata_sis.c - Silicon Integrated Systems SATA * * Copyright 2004 Uwe Koziolek * * The contents of this file are subject to the Open * Software License version 1.1 that can be found at * http://www.opensource.org/licenses/osl-1.1.txt and is included herein * by reference. * * Alternatively, the contents of this file may be used under the terms * of the GNU General Public License version 2 (the "GPL") as distributed * in the kernel source COPYING file, in which case the provisions of * the GPL are applicable instead of the above. If you wish to allow * the use of your version of this file only under the terms of the * GPL and not to allow others to use your version of this file under * the OSL, indicate your decision by deleting the provisions above and * replace them with the notice and other provisions required by the GPL. * If you do not delete the provisions above, a recipient may use your * version of this file under either the OSL or the GPL. * */ /* hotfix included for ASUS Boards P4R800, ASUS P4S800, with disabled SATA-Ports */ #include #include #include #include #include #include #include #include #include "scsi.h" #include "hosts.h" #include #define DRV_NAME "sata_sis" #define DRV_VERSION "0.06" enum { sis_180 = 0, }; static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent); static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg); static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); static void sis_phy_reset(struct ata_port *ap); #ifndef PCI_DEVICE_ID_SI_181 #define PCI_DEVICE_ID_SI_181 0x0181 #endif static struct pci_device_id sis_pci_tbl[] = { { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_180, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sis_180 }, { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_181, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sis_180 }, { } /* terminate list */ }; static struct pci_driver sis_pci_driver = { .name = DRV_NAME, .id_table = sis_pci_tbl, .probe = sis_init_one, .remove = ata_pci_remove_one, }; static Scsi_Host_Template sis_sht = { .module = THIS_MODULE, .name = DRV_NAME, .queuecommand = ata_scsi_queuecmd, .eh_strategy_handler = ata_scsi_error, .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, .sg_tablesize = ATA_MAX_PRD, .max_sectors = ATA_MAX_SECTORS, .cmd_per_lun = ATA_SHT_CMD_PER_LUN, .emulated = ATA_SHT_EMULATED, .use_clustering = ATA_SHT_USE_CLUSTERING, .proc_name = DRV_NAME, .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, }; static struct ata_port_operations sis_ops = { .port_disable = ata_port_disable, .tf_load = ata_tf_load_pio, .tf_read = ata_tf_read_pio, .check_status = ata_check_status_pio, .exec_command = ata_exec_command_pio, .phy_reset = sis_phy_reset, .bmdma_start = ata_bmdma_start_pio, .fill_sg = ata_fill_sg, .eng_timeout = ata_eng_timeout, .irq_handler = ata_interrupt, .scr_read = sis_scr_read, .scr_write = sis_scr_write, .port_start = ata_port_start, .port_stop = ata_port_stop, }; MODULE_AUTHOR("Uwe Koziolek"); MODULE_DESCRIPTION("low-level driver for Silicon Integratad Systems SATA controller"); MODULE_LICENSE("GPL"); MODULE_DEVICE_TABLE(pci, sis_pci_tbl); static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg) { if ((sc_reg >= 16) || (ap->ioaddr.scr_addr == 0)) return 0xfffffff3U; return inl(ap->ioaddr.scr_addr + (sc_reg * 4)); } static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val) { if ((sc_reg >= 16) || (ap->ioaddr.scr_addr == 0)) return; outl(val, ap->ioaddr.scr_addr + (sc_reg * 4)); } static void sis_phy_reset(struct ata_port *ap) { if (ap->ioaddr.scr_addr != 0) { sata_phy_reset(ap); return; } ata_port_probe(ap); ata_bus_reset(ap); } /* move to PCI layer, integrate w/ MSI stuff */ static void pci_enable_intx(struct pci_dev *pdev) { u16 pci_command; pci_read_config_word(pdev, PCI_COMMAND, &pci_command); if (pci_command & PCI_COMMAND_INTX_DISABLE) { pci_command &= ~PCI_COMMAND_INTX_DISABLE; pci_write_config_word(pdev, PCI_COMMAND, pci_command); } } static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) { struct ata_probe_ent *probe_ent = NULL; int rc; rc = pci_enable_device(pdev); if (rc) return rc; rc = pci_request_regions(pdev, DRV_NAME); if (rc) goto err_out; rc = pci_set_dma_mask(pdev, ATA_DMA_MASK); if (rc) goto err_out_regions; rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK); if (rc) goto err_out_regions; probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL); if (!probe_ent) { rc = -ENOMEM; goto err_out_regions; } memset(probe_ent, 0, sizeof(*probe_ent)); probe_ent->pdev = pdev; INIT_LIST_HEAD(&probe_ent->node); probe_ent->sht = &sis_sht; probe_ent->host_flags = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET | ATA_FLAG_NO_LEGACY; probe_ent->pio_mask = 0x03; probe_ent->udma_mask = 0x7f; probe_ent->port_ops = &sis_ops; probe_ent->port[0].cmd_addr = pci_resource_start(pdev, 0); ata_std_ports(&probe_ent->port[0]); probe_ent->port[0].ctl_addr = pci_resource_start(pdev, 1) | ATA_PCI_CTL_OFS; probe_ent->port[0].bmdma_addr = pci_resource_start(pdev, 4); probe_ent->port[0].scr_addr = pci_resource_start(pdev, 5); probe_ent->port[1].cmd_addr = pci_resource_start(pdev, 2); ata_std_ports(&probe_ent->port[1]); probe_ent->port[1].ctl_addr = pci_resource_start(pdev, 3) | ATA_PCI_CTL_OFS; probe_ent->port[1].bmdma_addr = pci_resource_start(pdev, 4) + 8; probe_ent->port[1].scr_addr = pci_resource_start(pdev, 5) + 64; /* use pata compatibility mode if sata ports disabled */ if (probe_ent->port[0].scr_addr == 0) { probe_ent->port[1].scr_addr = 0; probe_ent->host_flags = ATA_FLAG_SATA | ATA_FLAG_SRST | ATA_FLAG_NO_LEGACY; } probe_ent->n_ports = 2; probe_ent->irq = pdev->irq; probe_ent->irq_flags = SA_SHIRQ; pci_set_master(pdev); pci_enable_intx(pdev); /* FIXME: check ata_device_add return value */ ata_device_add(probe_ent); kfree(probe_ent); return 0; err_out_regions: pci_release_regions(pdev); err_out: pci_disable_device(pdev); return rc; } static int __init sis_init(void) { return pci_module_init(&sis_pci_driver); } static void __exit sis_exit(void) { pci_unregister_driver(&sis_pci_driver); } module_init(sis_init); module_exit(sis_exit); --=-LqvLeWWndYksy1jxnHk0--