Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd410ff1 authored by Tejun Heo's avatar Tejun Heo
Browse files

[PATCH] ahci: clean up AHCI constants in preparation for NCQ 



* Rename CMD_TBL_HDR to CMD_TBL_HDR_SZ as it's size not offset.

* Define MAX_CMDS and CMD_SZ and use them in calculation of other
  constants.

* Define CMD_TBL_AR_SZ as product of CMD_TBL_SZ and MAX_CMDS, and use
  it when calculating PRIV_DMA_SZ.

* CMD_SLOT_SZ is also dependent on MAX_CMDS but hasn't been changed
  because I didn't want to change the value used by the original code
  (32 commands).  Later NCQ change will bump MAX_CMDS to 32 anyway and
  the hard coded 32 can be changed to MAX_CMDS then.

* Reorder HOST_CAP_* flags.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
parent a6e6ce8e

drivers/scsi/ahci.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -56,12 +56,15 @@ enum { 
	AHCI_MAX_SG		= 168, /* hardware max is 64K */

	AHCI_MAX_SG		= 168, /* hardware max is 64K */

	AHCI_DMA_BOUNDARY	= 0xffffffff,

	AHCI_DMA_BOUNDARY	= 0xffffffff,

	AHCI_USE_CLUSTERING	= 0,

	AHCI_USE_CLUSTERING	= 0,

	AHCI_CMD_SLOT_SZ	= 32 * 32,

	AHCI_MAX_CMDS		= 1,

	AHCI_CMD_SZ		= 32,

	AHCI_CMD_SLOT_SZ	= 32 * AHCI_CMD_SZ,

	AHCI_RX_FIS_SZ		= 256,

	AHCI_RX_FIS_SZ		= 256,

	AHCI_CMD_TBL_HDR	= 0x80,

	AHCI_CMD_TBL_CDB	= 0x40,

	AHCI_CMD_TBL_CDB	= 0x40,

	AHCI_CMD_TBL_SZ		= AHCI_CMD_TBL_HDR + (AHCI_MAX_SG * 16),

	AHCI_CMD_TBL_HDR_SZ	= 0x80,

	AHCI_PORT_PRIV_DMA_SZ	= AHCI_CMD_SLOT_SZ + AHCI_CMD_TBL_SZ +

	AHCI_CMD_TBL_SZ		= AHCI_CMD_TBL_HDR_SZ + (AHCI_MAX_SG * 16),

	AHCI_CMD_TBL_AR_SZ	= AHCI_CMD_TBL_SZ * AHCI_MAX_CMDS,

	AHCI_PORT_PRIV_DMA_SZ	= AHCI_CMD_SLOT_SZ + AHCI_CMD_TBL_AR_SZ +

				  AHCI_RX_FIS_SZ,

				  AHCI_RX_FIS_SZ,

	AHCI_IRQ_ON_SG		= (1 << 31),

	AHCI_IRQ_ON_SG		= (1 << 31),

	AHCI_CMD_ATAPI		= (1 << 5),

	AHCI_CMD_ATAPI		= (1 << 5),
@@ -89,8 +92,8 @@ enum { 
	HOST_AHCI_EN		= (1 << 31), /* AHCI enabled */

	HOST_AHCI_EN		= (1 << 31), /* AHCI enabled */





	/* HOST_CAP bits */

	/* HOST_CAP bits */

	HOST_CAP_64		= (1 << 31), /* PCI DAC (64-bit DMA) support */

	HOST_CAP_CLO		= (1 << 24), /* Command List Override support */

	HOST_CAP_CLO		= (1 << 24), /* Command List Override support */

	HOST_CAP_64		= (1 << 31), /* PCI DAC (64-bit DMA) support */





	/* registers for each SATA port */

	/* registers for each SATA port */

	PORT_LST_ADDR		= 0x00, /* command list DMA addr */

	PORT_LST_ADDR		= 0x00, /* command list DMA addr */
@@ -398,7 +401,7 @@ static int ahci_port_start(struct ata_port *ap) 
	pp->cmd_tbl = mem;

	pp->cmd_tbl = mem;

	pp->cmd_tbl_dma = mem_dma;

	pp->cmd_tbl_dma = mem_dma;





	pp->cmd_tbl_sg = mem + AHCI_CMD_TBL_HDR;

	pp->cmd_tbl_sg = mem + AHCI_CMD_TBL_HDR_SZ;





	ap->private_data = pp;

	ap->private_data = pp;