tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'ata-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux

Pull ata fixes from Damien Le Moal:

- Compilation warning fixes from Arnd: one in the sata_sx4 driver due
to an incorrect calculation of the parameters passed to memcpy() and
another one in the sata_mv driver when CONFIG_PCI is not set

- Drop the owner driver field assignment in the pata_macio driver. That
is not needed as the PCI core code does that already (Krzysztof)

- Remove an unusued field in struct st_ahci_drv_data of the ahci_st
driver (Christophe)

- Add a missing clock probe error check in the sata_gemini driver
(Chen)

* tag 'ata-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
ata: sata_gemini: Check clk_enable() result
ata: sata_mv: Fix PCI device ID table declaration compilation warning
ata: ahci_st: Remove an unused field in struct st_ahci_drv_data
ata: pata_macio: drop driver owner assignment
ata: sata_sx4: fix pdc20621_get_from_dimm() on 64-bit

Linus Torvalds 4c3fc345 c42881d4

+37 -41
-1
drivers/ata/ahci_st.c
··· 30 30 #define ST_AHCI_OOBR_CIMAX_SHIFT 0 31 31 32 32 struct st_ahci_drv_data { 33 - struct platform_device *ahci; 34 33 struct reset_control *pwr; 35 34 struct reset_control *sw_rst; 36 35 struct reset_control *pwr_rst;
-3
drivers/ata/pata_macio.c
··· 1371 1371 .suspend = pata_macio_pci_suspend, 1372 1372 .resume = pata_macio_pci_resume, 1373 1373 #endif 1374 - .driver = { 1375 - .owner = THIS_MODULE, 1376 - }, 1377 1374 }; 1378 1375 MODULE_DEVICE_TABLE(pci, pata_macio_pci_match); 1379 1376
+4 -1
drivers/ata/sata_gemini.c
··· 200 200 pclk = sg->sata0_pclk; 201 201 else 202 202 pclk = sg->sata1_pclk; 203 - clk_enable(pclk); 203 + ret = clk_enable(pclk); 204 + if (ret) 205 + return ret; 206 + 204 207 msleep(10); 205 208 206 209 /* Do not keep clocking a bridge that is not online */
+31 -32
drivers/ata/sata_mv.c
··· 787 787 }, 788 788 }; 789 789 790 - static const struct pci_device_id mv_pci_tbl[] = { 791 - { PCI_VDEVICE(MARVELL, 0x5040), chip_504x }, 792 - { PCI_VDEVICE(MARVELL, 0x5041), chip_504x }, 793 - { PCI_VDEVICE(MARVELL, 0x5080), chip_5080 }, 794 - { PCI_VDEVICE(MARVELL, 0x5081), chip_508x }, 795 - /* RocketRAID 1720/174x have different identifiers */ 796 - { PCI_VDEVICE(TTI, 0x1720), chip_6042 }, 797 - { PCI_VDEVICE(TTI, 0x1740), chip_6042 }, 798 - { PCI_VDEVICE(TTI, 0x1742), chip_6042 }, 799 - 800 - { PCI_VDEVICE(MARVELL, 0x6040), chip_604x }, 801 - { PCI_VDEVICE(MARVELL, 0x6041), chip_604x }, 802 - { PCI_VDEVICE(MARVELL, 0x6042), chip_6042 }, 803 - { PCI_VDEVICE(MARVELL, 0x6080), chip_608x }, 804 - { PCI_VDEVICE(MARVELL, 0x6081), chip_608x }, 805 - 806 - { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x }, 807 - 808 - /* Adaptec 1430SA */ 809 - { PCI_VDEVICE(ADAPTEC2, 0x0243), chip_7042 }, 810 - 811 - /* Marvell 7042 support */ 812 - { PCI_VDEVICE(MARVELL, 0x7042), chip_7042 }, 813 - 814 - /* Highpoint RocketRAID PCIe series */ 815 - { PCI_VDEVICE(TTI, 0x2300), chip_7042 }, 816 - { PCI_VDEVICE(TTI, 0x2310), chip_7042 }, 817 - 818 - { } /* terminate list */ 819 - }; 820 - 821 790 static const struct mv_hw_ops mv5xxx_ops = { 822 791 .phy_errata = mv5_phy_errata, 823 792 .enable_leds = mv5_enable_leds, ··· 4272 4303 static int mv_pci_device_resume(struct pci_dev *pdev); 4273 4304 #endif 4274 4305 4306 + static const struct pci_device_id mv_pci_tbl[] = { 4307 + { PCI_VDEVICE(MARVELL, 0x5040), chip_504x }, 4308 + { PCI_VDEVICE(MARVELL, 0x5041), chip_504x }, 4309 + { PCI_VDEVICE(MARVELL, 0x5080), chip_5080 }, 4310 + { PCI_VDEVICE(MARVELL, 0x5081), chip_508x }, 4311 + /* RocketRAID 1720/174x have different identifiers */ 4312 + { PCI_VDEVICE(TTI, 0x1720), chip_6042 }, 4313 + { PCI_VDEVICE(TTI, 0x1740), chip_6042 }, 4314 + { PCI_VDEVICE(TTI, 0x1742), chip_6042 }, 4315 + 4316 + { PCI_VDEVICE(MARVELL, 0x6040), chip_604x }, 4317 + { PCI_VDEVICE(MARVELL, 0x6041), chip_604x }, 4318 + { PCI_VDEVICE(MARVELL, 0x6042), chip_6042 }, 4319 + { PCI_VDEVICE(MARVELL, 0x6080), chip_608x }, 4320 + { PCI_VDEVICE(MARVELL, 0x6081), chip_608x }, 4321 + 4322 + { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x }, 4323 + 4324 + /* Adaptec 1430SA */ 4325 + { PCI_VDEVICE(ADAPTEC2, 0x0243), chip_7042 }, 4326 + 4327 + /* Marvell 7042 support */ 4328 + { PCI_VDEVICE(MARVELL, 0x7042), chip_7042 }, 4329 + 4330 + /* Highpoint RocketRAID PCIe series */ 4331 + { PCI_VDEVICE(TTI, 0x2300), chip_7042 }, 4332 + { PCI_VDEVICE(TTI, 0x2310), chip_7042 }, 4333 + 4334 + { } /* terminate list */ 4335 + }; 4275 4336 4276 4337 static struct pci_driver mv_pci_driver = { 4277 4338 .name = DRV_NAME, ··· 4314 4315 #endif 4315 4316 4316 4317 }; 4318 + MODULE_DEVICE_TABLE(pci, mv_pci_tbl); 4317 4319 4318 4320 /** 4319 4321 * mv_print_info - Dump key info to kernel log for perusal. ··· 4487 4487 MODULE_AUTHOR("Brett Russ"); 4488 4488 MODULE_DESCRIPTION("SCSI low-level driver for Marvell SATA controllers"); 4489 4489 MODULE_LICENSE("GPL v2"); 4490 - MODULE_DEVICE_TABLE(pci, mv_pci_tbl); 4491 4490 MODULE_VERSION(DRV_VERSION); 4492 4491 MODULE_ALIAS("platform:" DRV_NAME); 4493 4492
+2 -4
drivers/ata/sata_sx4.c
··· 957 957 958 958 offset -= (idx * window_size); 959 959 idx++; 960 - dist = ((long) (window_size - (offset + size))) >= 0 ? size : 961 - (long) (window_size - offset); 960 + dist = min(size, window_size - offset); 962 961 memcpy_fromio(psource, dimm_mmio + offset / 4, dist); 963 962 964 963 psource += dist; ··· 1004 1005 readl(mmio + PDC_DIMM_WINDOW_CTLR); 1005 1006 offset -= (idx * window_size); 1006 1007 idx++; 1007 - dist = ((long)(s32)(window_size - (offset + size))) >= 0 ? size : 1008 - (long) (window_size - offset); 1008 + dist = min(size, window_size - offset); 1009 1009 memcpy_toio(dimm_mmio + offset / 4, psource, dist); 1010 1010 writel(0x01, mmio + PDC_GENERAL_CTLR); 1011 1011 readl(mmio + PDC_GENERAL_CTLR);