Commit 4c3fc345 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c42881d4 e85006ae

drivers/ata/ahci_st.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#define ST_AHCI_OOBR_CIMAX_SHIFT	0



struct st_ahci_drv_data {

	struct platform_device *ahci;

	struct reset_control *pwr;

	struct reset_control *sw_rst;

	struct reset_control *pwr_rst;

drivers/ata/pata_macio.c

+0 −3
Original line number Diff line number Diff line
@@ -1371,9 +1371,6 @@ static struct pci_driver pata_macio_pci_driver = { 
	.suspend	= pata_macio_pci_suspend,

	.resume		= pata_macio_pci_resume,

#endif

	.driver = {

		.owner		= THIS_MODULE,

	},

};

MODULE_DEVICE_TABLE(pci, pata_macio_pci_match);

drivers/ata/sata_gemini.c

+4 −1
Original line number Diff line number Diff line
@@ -200,7 +200,10 @@ int gemini_sata_start_bridge(struct sata_gemini *sg, unsigned int bridge) 
		pclk = sg->sata0_pclk;

	else

		pclk = sg->sata1_pclk;

	clk_enable(pclk);

	ret = clk_enable(pclk);

	if (ret)

		return ret;



	msleep(10);



	/* Do not keep clocking a bridge that is not online */

drivers/ata/sata_mv.c

+31 −32
Original line number Diff line number Diff line
@@ -787,37 +787,6 @@ static const struct ata_port_info mv_port_info[] = { 
	},

};



static const struct pci_device_id mv_pci_tbl[] = {

	{ PCI_VDEVICE(MARVELL, 0x5040), chip_504x },

	{ PCI_VDEVICE(MARVELL, 0x5041), chip_504x },

	{ PCI_VDEVICE(MARVELL, 0x5080), chip_5080 },

	{ PCI_VDEVICE(MARVELL, 0x5081), chip_508x },

	/* RocketRAID 1720/174x have different identifiers */

	{ PCI_VDEVICE(TTI, 0x1720), chip_6042 },

	{ PCI_VDEVICE(TTI, 0x1740), chip_6042 },

	{ PCI_VDEVICE(TTI, 0x1742), chip_6042 },



	{ PCI_VDEVICE(MARVELL, 0x6040), chip_604x },

	{ PCI_VDEVICE(MARVELL, 0x6041), chip_604x },

	{ PCI_VDEVICE(MARVELL, 0x6042), chip_6042 },

	{ PCI_VDEVICE(MARVELL, 0x6080), chip_608x },

	{ PCI_VDEVICE(MARVELL, 0x6081), chip_608x },



	{ PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x },



	/* Adaptec 1430SA */

	{ PCI_VDEVICE(ADAPTEC2, 0x0243), chip_7042 },



	/* Marvell 7042 support */

	{ PCI_VDEVICE(MARVELL, 0x7042), chip_7042 },



	/* Highpoint RocketRAID PCIe series */

	{ PCI_VDEVICE(TTI, 0x2300), chip_7042 },

	{ PCI_VDEVICE(TTI, 0x2310), chip_7042 },



	{ }			/* terminate list */

};



static const struct mv_hw_ops mv5xxx_ops = {

	.phy_errata		= mv5_phy_errata,

	.enable_leds		= mv5_enable_leds,
@@ -4303,6 +4272,36 @@ static int mv_pci_init_one(struct pci_dev *pdev, 
static int mv_pci_device_resume(struct pci_dev *pdev);

#endif



static const struct pci_device_id mv_pci_tbl[] = {

	{ PCI_VDEVICE(MARVELL, 0x5040), chip_504x },

	{ PCI_VDEVICE(MARVELL, 0x5041), chip_504x },

	{ PCI_VDEVICE(MARVELL, 0x5080), chip_5080 },

	{ PCI_VDEVICE(MARVELL, 0x5081), chip_508x },

	/* RocketRAID 1720/174x have different identifiers */

	{ PCI_VDEVICE(TTI, 0x1720), chip_6042 },

	{ PCI_VDEVICE(TTI, 0x1740), chip_6042 },

	{ PCI_VDEVICE(TTI, 0x1742), chip_6042 },



	{ PCI_VDEVICE(MARVELL, 0x6040), chip_604x },

	{ PCI_VDEVICE(MARVELL, 0x6041), chip_604x },

	{ PCI_VDEVICE(MARVELL, 0x6042), chip_6042 },

	{ PCI_VDEVICE(MARVELL, 0x6080), chip_608x },

	{ PCI_VDEVICE(MARVELL, 0x6081), chip_608x },



	{ PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x },



	/* Adaptec 1430SA */

	{ PCI_VDEVICE(ADAPTEC2, 0x0243), chip_7042 },



	/* Marvell 7042 support */

	{ PCI_VDEVICE(MARVELL, 0x7042), chip_7042 },



	/* Highpoint RocketRAID PCIe series */

	{ PCI_VDEVICE(TTI, 0x2300), chip_7042 },

	{ PCI_VDEVICE(TTI, 0x2310), chip_7042 },



	{ }			/* terminate list */

};



static struct pci_driver mv_pci_driver = {

	.name			= DRV_NAME,
@@ -4315,6 +4314,7 @@ static struct pci_driver mv_pci_driver = { 
#endif



};

MODULE_DEVICE_TABLE(pci, mv_pci_tbl);



/**

 *      mv_print_info - Dump key info to kernel log for perusal.
@@ -4487,7 +4487,6 @@ static void __exit mv_exit(void) 
MODULE_AUTHOR("Brett Russ");

MODULE_DESCRIPTION("SCSI low-level driver for Marvell SATA controllers");

MODULE_LICENSE("GPL v2");

MODULE_DEVICE_TABLE(pci, mv_pci_tbl);

MODULE_VERSION(DRV_VERSION);

MODULE_ALIAS("platform:" DRV_NAME);

drivers/ata/sata_sx4.c

+2 −4
Original line number Diff line number Diff line
@@ -957,8 +957,7 @@ static void pdc20621_get_from_dimm(struct ata_host *host, void *psource, 


	offset -= (idx * window_size);

	idx++;

	dist = ((long) (window_size - (offset + size))) >= 0 ? size :

		(long) (window_size - offset);

	dist = min(size, window_size - offset);

	memcpy_fromio(psource, dimm_mmio + offset / 4, dist);



	psource += dist;
@@ -1005,8 +1004,7 @@ static void pdc20621_put_to_dimm(struct ata_host *host, void *psource, 
	readl(mmio + PDC_DIMM_WINDOW_CTLR);

	offset -= (idx * window_size);

	idx++;

	dist = ((long)(s32)(window_size - (offset + size))) >= 0 ? size :

		(long) (window_size - offset);

	dist = min(size, window_size - offset);

	memcpy_toio(dimm_mmio + offset / 4, psource, dist);

	writel(0x01, mmio + PDC_GENERAL_CTLR);

	readl(mmio + PDC_GENERAL_CTLR);