libata updates for .32
Subsystems (6)
PATCH 1/1 libata updates for .32
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
Documentation/feature-removal-schedule.txt | 18 -- arch/x86/pci/direct.c | 5 +- drivers/acpi/blacklist.c | 5 +- drivers/ata/Kconfig | 21 ++ drivers/ata/Makefile | 1 + drivers/ata/ahci.c | 143 ++++++++--- drivers/ata/libata-acpi.c | 7 +- drivers/ata/libata-core.c | 44 +++- drivers/ata/libata-eh.c | 146 ++++++++++- drivers/ata/libata-pmp.c | 2 + drivers/ata/libata-scsi.c | 159 ++++-------- drivers/ata/libata.h | 1 + drivers/ata/pata_atiixp.c | 1 + drivers/ata/pata_cs5535.c | 3 +- drivers/ata/pata_octeon_cf.c | 4 +- drivers/ata/pata_platform.c | 8 +- drivers/ata/pata_rb532_cf.c | 2 +- drivers/ata/pata_rdc.c | 400 ++++++++++++++++++++++++++++ drivers/ata/pata_rz1000.c | 4 +- drivers/ata/sata_fsl.c | 1 + drivers/ata/sata_inic162x.c | 2 +- drivers/ata/sata_mv.c | 2 +- drivers/ata/sata_sil.c | 13 + drivers/ata/sata_sil24.c | 11 + drivers/ata/sata_sis.c | 75 ++---- drivers/firmware/dmi_scan.c | 77 ++++-- drivers/ide/atiixp.c | 1 + drivers/pci/quirks.c | 4 +- include/linux/ata.h | 36 +++- include/linux/dmi.h | 13 +- include/linux/libata.h | 3 +- include/linux/pci_ids.h | 4 + 32 files changed, 946 insertions(+), 270 deletions(-) create mode 100644 drivers/ata/pata_rdc.c
Alan Cox (1):
[libata] Add pata_rdc driver for RDC ATA devices
Ashish Kalra (1):
sata_fsl: Defer non-ncq commands when ncq commands active
Jeff Garzik (2):
[libata] EH: freeze port before aborting commands [libata] sata_sil: disable DMA engine in sil_freeze()
Joe Perches (1):
drivers/ata: Remove unnecessary semicolons
Julia Lawall (1):
drivers/ata: use resource_size
Marcin Slusarz (1):
pata_rz1000: use printk_once
Martin K. Petersen (1):
libata: Delegate nonrot flag setting to SCSI
Matthew Garrett (1):
libata: Export AHCI capabilities
Otavio Salvador (1):
pata_cs5535: add pci id for AMD based CS5535 controllers
Robert Hancock (2):
libata: add command name parsing for error output
sata_sil24: always set protocol override for non-ATAPI data commands
Shane Huang (3):
libata: add SATA PMP revision information for spec 1.2
ahci: Add AMD SB900 SATA/IDE controller device IDs
ahci: kill @force_restart and refine CLO for ahci_kick_engine()
Shaohua Li (1):
[libata] add DMA setup FIS auto-activate feature
Tejun Heo (9):
libata: clear eh_info on reset completion
libata: remove spindown skipping and warning
sata_sis: convert to slave_link
libata: unbreak TPM filtering by reorganizing ata_scsi_pass_thru()
dmi: fix date handling in dmi_get_year()
dmi: extend dmi_get_year() to dmi_get_date()
ahci: make ahci_asus_m2a_vm_32bit_only() quirk more generic
ahci: Gigabyte GA-MA69VM-S2 can't do 64bit DMA
libata: fix off-by-one error in ata_tf_read_block()
Documentation/feature-removal-schedule.txt +0 -18
@@ -206,24 +206,6 @@ Who: Len Brown <[email protected]> --------------------------- -What: libata spindown skipping and warning -When: Dec 2008 -Why: Some halt(8) implementations synchronize caches for and spin - down libata disks because libata didn't use to spin down disk on - system halt (only synchronized caches). - Spin down on system halt is now implemented. sysfs node - /sys/class/scsi_disk/h:c:i:l/manage_start_stop is present if - spin down support is available. - Because issuing spin down command to an already spun down disk - makes some disks spin up just to spin down again, libata tracks - device spindown status to skip the extra spindown command and - warn about it. - This is to give userspace tools the time to get updated and will - be removed after userspace is reasonably updated. -Who: Tejun Heo <[email protected]> - ---------------------------- - What: i386/x86_64 bzImage symlinks When: April 2010
arch/x86/pci/direct.c +3 -2
@@ -192,13 +192,14 @@ struct pci_raw_ops pci_direct_conf2 = {static int __init pci_sanity_check (struct pci_raw_ops *o) {u32 x =0 ; -int devfn; +int year, devfn;if (pci_probe &PCI_NO_CHECKS )return 1 ;/* Assume Type 1 works for newer systems. This handles machines that don't have anything on PCI Bus 0. */ -if (dmi_get_year (DMI_BIOS_DATE ) >=2001 ) +dmi_get_date (DMI_BIOS_DATE , &year,NULL ,NULL ); +if (year >=2001 )return 1 ;for (devfn =0 ; devfn <0x100 ; devfn++) {
drivers/acpi/blacklist.c +3 -2
@@ -78,9 +78,10 @@ static struct acpi_blacklist_item acpi_blacklist[] __initdata = {static int __init blacklist_by_year (void ) { -int year =dmi_get_year (DMI_BIOS_DATE ); +int year; +/* Doesn't exist? Likely an old system */ -if (year ==-1 ) { +if (!dmi_get_date (DMI_BIOS_DATE , &year,NULL ,NULL )) { printk(KERN_ERR PREFIX "no DMI BIOS year, " "acpi=force is required to enable ACPI\n" );return 1 ;
drivers/ata/Kconfig +21 -0
@@ -26,6 +26,17 @@ config ATA_NONSTANDARD bool default n +config ATA_VERBOSE_ERROR + bool "Verbose ATA error reporting" + default y + help + This option adds parsing of ATA command descriptions and error bits + in libata kernel output, making it easier to interpret. + This option will enlarge the kernel by approx. 6KB. Disable it only + if kernel size is more important than ease of debugging. + + If unsure, say Y. + config ATA_ACPI bool "ATA ACPI Support" depends on ACPI && PCI
@@ -586,6 +597,16 @@ config PATA_RB532 If unsure, say N. +config PATA_RDC + tristate "RDC PATA support" + depends on PCI + help + This option enables basic support for the later RDC PATA controllers + controllers via the new ATA layer. For the RDC 1010, you need to + enable the IT821X driver instead. + + If unsure, say N. + config PATA_RZ1000 tristate "PC Tech RZ1000 PATA support" depends on PCI
drivers/ata/Makefile +1 -0
@@ -57,6 +57,7 @@ obj-$(CONFIG_PATA_PDC_OLD) += pata_pdc202xx_old.o obj-$(CONFIG_PATA_QDI) += pata_qdi.o obj-$(CONFIG_PATA_RADISYS) += pata_radisys.o obj-$(CONFIG_PATA_RB532) += pata_rb532_cf.o +obj-$(CONFIG_PATA_RDC) += pata_rdc.o obj-$(CONFIG_PATA_RZ1000) += pata_rz1000.o obj-$(CONFIG_PATA_SC1200) += pata_sc1200.o obj-$(CONFIG_PATA_SERVERWORKS) += pata_serverworks.o
drivers/ata/ahci.c +106 -37
241 lines not on this page · raw message
drivers/ata/libata-acpi.c +5 -2
@@ -689,6 +689,7 @@ static int ata_acpi_run_tf(struct ata_device *dev,struct ata_taskfile tf, ptf, rtf;unsigned int err_mask;const char *level; +const char *descr;char msg[60 ];int rc;
@@ -736,11 +737,13 @@ static int ata_acpi_run_tf(struct ata_device *dev,snprintf (msg,sizeof (msg),"filtered out" ); rc =0 ; } + descr =ata_get_cmd_descript (tf.command);ata_dev_printk (dev, level, -"ACPI cmd %02x/%02x:%02x:%02x:%02x:%02x:%02x %s\n" , +"ACPI cmd %02x/%02x:%02x:%02x:%02x:%02x:%02x (%s) %s\n" , tf.command, tf.feature, tf.nsect, tf.lbal, - tf.lbam, tf.lbah, tf.device, msg); + tf.lbam, tf.lbah, tf.device, + (descr ? descr :"unknown" ), msg);return rc; }
drivers/ata/libata-core.c +36 -8
86 lines not on this page · raw message
drivers/ata/libata-eh.c +139 -7
215 lines not on this page · raw message
drivers/ata/libata-pmp.c +2 -0
@@ -221,6 +221,8 @@ static const char *sata_pmp_spec_rev_str(const u32 *gscr) {u32 rev = gscr[SATA_PMP_GSCR_REV ]; +if (rev & (1 <<3 )) +return "1.2" ;if (rev & (1 <<2 ))return "1.1" ;if (rev & (1 <<1 ))
drivers/ata/libata-scsi.c +51 -108
212 lines not on this page · raw message
drivers/ata/libata.h +1 -0
@@ -164,6 +164,7 @@ extern void ata_eh_about_to_do(struct ata_link *link, struct ata_device *dev,extern void ata_eh_done (struct ata_link *link,struct ata_device *dev,unsigned int action);extern void ata_eh_autopsy (struct ata_port *ap); +const char *ata_get_cmd_descript (u8 command);extern void ata_eh_report (struct ata_port *ap); extern int ata_eh_reset(struct ata_link *link, int classify, ata_prereset_fn_t prereset, ata_reset_fn_t softreset,
drivers/ata/pata_atiixp.c +1 -0
@@ -246,6 +246,7 @@ static const struct pci_device_id atiixp[] = { { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP400_IDE), }, { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP600_IDE), }, { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP700_IDE), }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_SB900_IDE), }, { }, };
drivers/ata/pata_cs5535.c +2 -1
@@ -202,7 +202,8 @@ static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id) }static const struct pci_device_id cs5535[] = { - {PCI_VDEVICE (NS ,0x002D ), }, + {PCI_VDEVICE (NS ,PCI_DEVICE_ID_NS_CS5535_IDE ), }, + {PCI_VDEVICE (AMD ,PCI_DEVICE_ID_AMD_CS5535_IDE ), }, { }, };
drivers/ata/pata_octeon_cf.c +2 -2
@@ -213,7 +213,7 @@ static void octeon_cf_set_dmamode(struct ata_port *ap, struct ata_device *dev)* This is tI, C.F. spec. says 0, but Sony CF card requires * more, we use 20 nS. */ - dma_tim.s.dmack_s =ns_to_tim_reg (tim_mult,20 );; + dma_tim.s.dmack_s =ns_to_tim_reg (tim_mult,20 ); dma_tim.s.dmack_h =ns_to_tim_reg (tim_mult, dma_ackh); dma_tim.s.dmarq = dma_arq;
@@ -841,7 +841,7 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev) ocd = pdev->dev.platform_data; cs0 =devm_ioremap_nocache (&pdev->dev, res_cs0->start, - res_cs0->end - res_cs0->start +1 ); +resource_size (res_cs0));if (!cs0)return -ENOMEM ;
drivers/ata/pata_platform.c +4 -4
@@ -151,14 +151,14 @@ int __devinit __pata_platform_probe(struct device *dev,*/ if (mmio) { ap->ioaddr.cmd_addr =devm_ioremap (dev, io_res->start, - io_res->end - io_res->start +1 ); +resource_size (io_res)); ap->ioaddr.ctl_addr =devm_ioremap (dev, ctl_res->start, - ctl_res->end - ctl_res->start +1 ); +resource_size (ctl_res)); }else { ap->ioaddr.cmd_addr =devm_ioport_map (dev, io_res->start, - io_res->end - io_res->start +1 ); +resource_size (io_res)); ap->ioaddr.ctl_addr =devm_ioport_map (dev, ctl_res->start, - ctl_res->end - ctl_res->start +1 ); +resource_size (ctl_res)); }if (!ap->ioaddr.cmd_addr || !ap->ioaddr.ctl_addr) {dev_err (dev,"failed to map IO/CTL base\n" );
drivers/ata/pata_rb532_cf.c +1 -1
@@ -151,7 +151,7 @@ static __devinit int rb532_pata_driver_probe(struct platform_device *pdev) info->irq = irq; info->iobase =devm_ioremap_nocache (&pdev->dev, res->start, - res->end - res->start +1 ); +resource_size (res));if (!info->iobase)return -ENOMEM ;
drivers/ata/pata_rdc.c new file +400 -0
400 lines not on this page · raw message
drivers/ata/pata_rz1000.c +1 -3
@@ -85,7 +85,6 @@ static int rz1000_fifo_disable(struct pci_dev *pdev)static int rz1000_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;static const struct ata_port_info info = { .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =ATA_PIO4 ,
@@ -93,8 +92,7 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en };const struct ata_port_info *ppi[] = { &info,NULL }; -if (!printed_version++) - printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); + printk_once(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");if (rz1000_fifo_disable (pdev) ==0 )return ata_pci_sff_init_one (pdev, ppi, &rz1000_sht,NULL );
drivers/ata/sata_fsl.c +1 -0
@@ -1257,6 +1257,7 @@ static struct scsi_host_template sata_fsl_sht = {static struct ata_port_operations sata_fsl_ops = { .inherits = &sata_pmp_port_ops, + .qc_defer = ata_std_qc_defer, .qc_prep = sata_fsl_qc_prep, .qc_issue = sata_fsl_qc_issue, .qc_fill_rtf = sata_fsl_qc_fill_rtf,
drivers/ata/sata_inic162x.c +1 -1
@@ -405,7 +405,7 @@ static irqreturn_t inic_interrupt(int irq, void *dev_instance)struct ata_host *host = dev_instance;struct inic_host_priv *hpriv = host->private_data;u16 host_irq_stat; -int i, handled =0 ;; +int i, handled =0 ; host_irq_stat =readw (hpriv->mmio_base +HOST_IRQ_STAT );
drivers/ata/sata_mv.c +1 -1
@@ -4013,7 +4013,7 @@ static int mv_platform_probe(struct platform_device *pdev) host->iomap =NULL ; hpriv->base =devm_ioremap (&pdev->dev, res->start, - res->end - res->start +1 ); +resource_size (res)); hpriv->base -=SATAHC0_REG_BASE ;/*
drivers/ata/sata_sil.c +13 -0
@@ -565,6 +565,19 @@ static void sil_freeze(struct ata_port *ap) tmp |=SIL_MASK_IDE0_INT << ap->port_no;writel (tmp, mmio_base +SIL_SYSCFG );readl (mmio_base +SIL_SYSCFG );/* flush */ + +/* Ensure DMA_ENABLE is off. +* +* This is because the controller will not give us access to the +* taskfile registers while a DMA is in progress +*/ +iowrite8 (ioread8 (ap->ioaddr.bmdma_addr) & ~SIL_DMA_ENABLE , + ap->ioaddr.bmdma_addr); + +/* According to ata_bmdma_stop, an HDMA transition requires +* on PIO cycle. But we can't read a taskfile register. +*/ +ioread8 (ap->ioaddr.bmdma_addr); }static void sil_thaw (struct ata_port *ap)
drivers/ata/sata_sil24.c +11 -0
@@ -846,6 +846,17 @@ static void sil24_qc_prep(struct ata_queued_cmd *qc)if (!ata_is_atapi (qc->tf.protocol)) { prb = &cb->ata.prb; sge = cb->ata.sge; +if (ata_is_data (qc->tf.protocol)) { +u16 prot =0 ; + ctrl =PRB_CTRL_PROTOCOL ; +if (ata_is_ncq (qc->tf.protocol)) + prot |=PRB_PROT_NCQ ; +if (qc->tf.flags &ATA_TFLAG_WRITE ) + prot |=PRB_PROT_WRITE ; +else + prot |=PRB_PROT_READ ; + prb->prot =cpu_to_le16 (prot); + } }else { prb = &cb->atapi.prb; sge = cb->atapi.sge;
drivers/ata/sata_sis.c +25 -50
143 lines not on this page · raw message
drivers/firmware/dmi_scan.c +59 -18
94 lines not on this page · raw message
drivers/ide/atiixp.c +1 -0
@@ -177,6 +177,7 @@ static const struct pci_device_id atiixp_pci_tbl[] = { { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP400_IDE), 0 }, { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP600_IDE), 1 }, { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP700_IDE), 0 }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_SB900_IDE), 0 }, { 0, }, };MODULE_DEVICE_TABLE (pci, atiixp_pci_tbl);
drivers/pci/quirks.c +3 -1
@@ -992,7 +992,7 @@ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82454NX,static void __devinit quirk_amd_ide_mode (struct pci_dev *pdev) { -/* set sb600/sb700/sb800 sata to ahci mode */ +/* set SBX00 SATA in IDE mode to AHCI mode */ u8 tmp;pci_read_config_byte (pdev,PCI_CLASS_DEVICE , &tmp);
@@ -1011,6 +1011,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirkDECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_ATI ,PCI_DEVICE_ID_ATI_IXP600_SATA , quirk_amd_ide_mode);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_ATI ,PCI_DEVICE_ID_ATI_IXP700_SATA , quirk_amd_ide_mode);DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_ATI ,PCI_DEVICE_ID_ATI_IXP700_SATA , quirk_amd_ide_mode); +DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_SB900_SATA_IDE , quirk_amd_ide_mode); +DECLARE_PCI_FIXUP_RESUME_EARLY (PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_SB900_SATA_IDE , quirk_amd_ide_mode);/* * Serverworks CSB5 IDE does not fully support native mode
include/linux/ata.h +35 -1
@@ -210,15 +210,25 @@ enum {ATA_CMD_STANDBY =0xE2 ,/* place in standby power mode */ ATA_CMD_IDLE =0xE3 ,/* place in idle power mode */ ATA_CMD_EDD =0x90 ,/* execute device diagnostic */ +ATA_CMD_DOWNLOAD_MICRO =0x92 , +ATA_CMD_NOP =0x00 ,ATA_CMD_FLUSH =0xE7 ,ATA_CMD_FLUSH_EXT =0xEA ,ATA_CMD_ID_ATA =0xEC ,ATA_CMD_ID_ATAPI =0xA1 , +ATA_CMD_SERVICE =0xA2 ,ATA_CMD_READ =0xC8 ,ATA_CMD_READ_EXT =0x25 , +ATA_CMD_READ_QUEUED =0x26 , +ATA_CMD_READ_STREAM_EXT =0x2B , +ATA_CMD_READ_STREAM_DMA_EXT =0x2A ,ATA_CMD_WRITE =0xCA ,ATA_CMD_WRITE_EXT =0x35 , +ATA_CMD_WRITE_QUEUED =0x36 , +ATA_CMD_WRITE_STREAM_EXT =0x3B , +ATA_CMD_WRITE_STREAM_DMA_EXT =0x3A ,ATA_CMD_WRITE_FUA_EXT =0x3D , +ATA_CMD_WRITE_QUEUED_FUA_EXT =0x3E ,ATA_CMD_FPDMA_READ =0x60 ,ATA_CMD_FPDMA_WRITE =0x61 , ATA_CMD_PIO_READ = 0x20,
@@ -235,6 +245,7 @@ enum {ATA_CMD_PACKET =0xA0 ,ATA_CMD_VERIFY =0x40 ,ATA_CMD_VERIFY_EXT =0x42 , +ATA_CMD_WRITE_UNCORR_EXT =0x45 ,ATA_CMD_STANDBYNOW1 =0xE0 ,ATA_CMD_IDLEIMMEDIATE =0xE1 , ATA_CMD_SLEEP = 0xE6,
@@ -243,15 +254,34 @@ enum {ATA_CMD_READ_NATIVE_MAX_EXT =0x27 ,ATA_CMD_SET_MAX =0xF9 ,ATA_CMD_SET_MAX_EXT =0x37 , -ATA_CMD_READ_LOG_EXT =0x2f , +ATA_CMD_READ_LOG_EXT =0x2F , +ATA_CMD_WRITE_LOG_EXT =0x3F , +ATA_CMD_READ_LOG_DMA_EXT =0x47 , +ATA_CMD_WRITE_LOG_DMA_EXT =0x57 , +ATA_CMD_TRUSTED_RCV =0x5C , +ATA_CMD_TRUSTED_RCV_DMA =0x5D , +ATA_CMD_TRUSTED_SND =0x5E , +ATA_CMD_TRUSTED_SND_DMA =0x5F ,ATA_CMD_PMP_READ =0xE4 ,ATA_CMD_PMP_WRITE =0xE8 ,ATA_CMD_CONF_OVERLAY =0xB1 , +ATA_CMD_SEC_SET_PASS =0xF1 , +ATA_CMD_SEC_UNLOCK =0xF2 , +ATA_CMD_SEC_ERASE_PREP =0xF3 , +ATA_CMD_SEC_ERASE_UNIT =0xF4 ,ATA_CMD_SEC_FREEZE_LOCK =0xF5 , +ATA_CMD_SEC_DISABLE_PASS =0xF6 , +ATA_CMD_CONFIG_STREAM =0x51 ,ATA_CMD_SMART =0xB0 ,ATA_CMD_MEDIA_LOCK =0xDE ,ATA_CMD_MEDIA_UNLOCK =0xDF ,ATA_CMD_DSM =0x06 , +ATA_CMD_CHK_MED_CRD_TYP =0xD1 , +ATA_CMD_CFA_REQ_EXT_ERR =0x03 , +ATA_CMD_CFA_WRITE_NE =0x38 , +ATA_CMD_CFA_TRANS_SECT =0x87 , +ATA_CMD_CFA_ERASE =0xC0 , +ATA_CMD_CFA_WRITE_MULT_NE =0xCD ,/* marked obsolete in the ATA/ATAPI-7 spec */ ATA_CMD_RESTORE = 0x10,
@@ -306,6 +336,7 @@ enum {/* SETFEATURE Sector counts for SATA features */ SATA_AN =0x05 ,/* Asynchronous Notification */ SATA_DIPM =0x03 ,/* Device Initiated Power Management */ +SATA_FPDMA_AA =0x02 ,/* DMA Setup FIS Auto-Activate */ /* feature values for SET_MAX */ ATA_SET_MAX_ADDR = 0x00,
@@ -525,6 +556,9 @@ static inline int ata_is_data(u8 prot)#define ata_id_has_atapi_AN (id) \ ( (((id)[76] != 0x0000) && ((id)[76] != 0xffff)) && \ ((id)[78] & (1 << 5)) ) +#define ata_id_has_fpdma_aa (id) \ + ( (((id)[76] != 0x0000) && ((id)[76] != 0xffff)) && \ + ((id)[78] & (1 << 2)) )#define ata_id_iordy_disable (id) ((id)[ATA_ID_CAPABILITY] & (1 << 10))#define ata_id_has_iordy (id) ((id)[ATA_ID_CAPABILITY] & (1 << 11))#define ata_id_u32 (id,n) \
include/linux/dmi.h +11 -2
@@ -43,7 +43,7 @@ extern const char * dmi_get_system_info(int field);extern const struct dmi_device *dmi_find_device (int type,const char *name,const struct dmi_device *from);extern void dmi_scan_machine (void ); -extern int dmi_get_year (int field); +extern bool dmi_get_date (int field,int *yearp,int *monthp,int *dayp);extern int dmi_name_in_vendors (const char *str);extern int dmi_name_in_serial (const char *str);extern int dmi_available;
@@ -58,7 +58,16 @@ static inline const char * dmi_get_system_info(int field) { return NULL; }static inline const struct dmi_device *dmi_find_device (int type,const char *name,const struct dmi_device *from) {return NULL ; }static inline void dmi_scan_machine (void ) {return ; } -static inline int dmi_get_year (int year) {return 0 ; } +static inline bool dmi_get_date (int field,int *yearp,int *monthp,int *dayp) +{ +if (yearp) + *yearp =0 ; +if (monthp) + *monthp =0 ; +if (dayp) + *dayp =0 ; +return false; +}static inline int dmi_name_in_vendors (const char *s) {return 0 ; }static inline int dmi_name_in_serial (const char *s) {return 0 ; }#define dmi_available 0
include/linux/libata.h +2 -1
@@ -143,7 +143,6 @@ enum {ATA_DFLAG_PIO = (1 <<12 ),/* device limited to PIO mode */ ATA_DFLAG_NCQ_OFF = (1 <<13 ),/* device limited to non-NCQ mode */ -ATA_DFLAG_SPUNDOWN = (1 <<14 ),/* XXX: for spindown_compat */ ATA_DFLAG_SLEEPING = (1 <<15 ),/* device is sleeping */ ATA_DFLAG_DUBIOUS_XFER = (1 <<16 ),/* data transfer not verified */ ATA_DFLAG_NO_UNLOAD = (1 << 17), /* device doesn't support unload */
@@ -190,6 +189,7 @@ enum {ATA_FLAG_NO_POWEROFF_SPINDOWN = (1 <<11 ),/* don't spindown before poweroff */ ATA_FLAG_NO_HIBERNATE_SPINDOWN = (1 <<12 ),/* don't spindown before hibernation */ ATA_FLAG_DEBUGMSG = (1 <<13 ), +ATA_FLAG_FPDMA_AA = (1 <<14 ),/* driver supports Auto-Activate */ ATA_FLAG_IGN_SIMPLEX = (1 <<15 ),/* ignore SIMPLEX */ ATA_FLAG_NO_IORDY = (1 <<16 ),/* controller lacks iordy */ ATA_FLAG_ACPI_SATA = (1 << 17), /* need native SATA ACPI layout */
@@ -386,6 +386,7 @@ enum {ATA_HORKAGE_FIRMWARE_WARN = (1 <<12 ),/* firmware update warning */ ATA_HORKAGE_1_5_GBPS = (1 <<13 ),/* force 1.5 Gbps */ ATA_HORKAGE_NOSETXFER = (1 <<14 ),/* skip SETXFER, SATA only */ + ATA_HORKAGE_BROKEN_FPDMA_AA = (1 << 15), /* skip AA *//* DMA mask for user DMA control: User visible values; DO NOT renumber */
include/linux/pci_ids.h +4 -0
@@ -376,6 +376,9 @@#define PCI_DEVICE_ID_ATI_IXP600_IDE 0x438c#define PCI_DEVICE_ID_ATI_IXP700_SATA 0x4390#define PCI_DEVICE_ID_ATI_IXP700_IDE 0x439c +/* AMD SB Chipset */ +#define PCI_DEVICE_ID_AMD_SB900_IDE 0x780c +#define PCI_DEVICE_ID_AMD_SB900_SATA_IDE 0x7800#define PCI_VENDOR_ID_VLSI 0x1004#define PCI_DEVICE_ID_VLSI_82C592 0x0005
@@ -537,6 +540,7 @@#define PCI_DEVICE_ID_AMD_8131_BRIDGE 0x7450#define PCI_DEVICE_ID_AMD_8131_APIC 0x7451#define PCI_DEVICE_ID_AMD_8132_BRIDGE 0x7458 +#define PCI_DEVICE_ID_AMD_CS5535_IDE 0x208F#define PCI_DEVICE_ID_AMD_CS5536_ISA 0x2090#define PCI_DEVICE_ID_AMD_CS5536_FLASH 0x2091#define PCI_DEVICE_ID_AMD_CS5536_AUDIO 0x2093
Quoted 3 lines · Jeff Garzik
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
Would you be willing to fix a few checkpatch errors in there? I don't usually check pull requests, but the patch you included did have a couple errors.
Daniel