ahci: convert enum to #define
PATCH 1/1 ahci: convert enum to #define
Convert enum to #define.
Signed-off-by Sebastian Herbszt <[email protected]>
hw/ahci.c +118 -132
@@ -40,138 +40,124 @@ do { fprintf(stderr,"ahci: " fmt , ## __VA_ARGS__); } while (0)#define DPRINTF (fmt, ...) do {} while(0)#endif -enum { -AHCI_PCI_BAR =5 , -AHCI_MAX_PORTS =32 , -AHCI_MAX_SG =168 ,/* hardware max is 64K */ -AHCI_DMA_BOUNDARY =0xffffffff , -AHCI_USE_CLUSTERING =0 , -AHCI_MAX_CMDS =32 , -AHCI_CMD_SZ =32 , -AHCI_CMD_SLOT_SZ =AHCI_MAX_CMDS *AHCI_CMD_SZ , -AHCI_RX_FIS_SZ =256 , -AHCI_CMD_TBL_CDB =0x40 , -AHCI_CMD_TBL_HDR_SZ =0x80 , -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_IRQ_ON_SG = (1 <<31 ), -AHCI_CMD_ATAPI = (1 <<5 ), -AHCI_CMD_WRITE = (1 <<6 ), -AHCI_CMD_PREFETCH = (1 <<7 ), -AHCI_CMD_RESET = (1 <<8 ), -AHCI_CMD_CLR_BUSY = (1 <<10 ), - -RX_FIS_D2H_REG =0x40 ,/* offset of D2H Register FIS data */ -RX_FIS_SDB =0x58 ,/* offset of SDB FIS data */ -RX_FIS_UNK =0x60 ,/* offset of Unknown FIS data */ - - board_ahci =0 , - board_ahci_pi =1 , - board_ahci_vt8251 =2 , - board_ahci_ign_iferr =3 , - board_ahci_sb600 =4 , - -/* global controller registers */ -HOST_CAP =0x00 ,/* host capabilities */ -HOST_CTL =0x04 ,/* global host control */ -HOST_IRQ_STAT =0x08 ,/* interrupt status */ -HOST_PORTS_IMPL =0x0c ,/* bitmap of implemented ports */ -HOST_VERSION =0x10 ,/* AHCI spec. version compliancy */ - -/* HOST_CTL bits */ -HOST_RESET = (1 <<0 ),/* reset controller; self-clear */ -HOST_IRQ_EN = (1 <<1 ),/* global IRQ enable */ -HOST_AHCI_EN = (1 <<31 ),/* AHCI enabled */ - -/* HOST_CAP bits */ -HOST_CAP_SSC = (1 <<14 ),/* Slumber capable */ -HOST_CAP_CLO = (1 <<24 ),/* Command List Override support */ -HOST_CAP_SSS = (1 <<27 ),/* Staggered Spin-up */ -HOST_CAP_NCQ = (1 <<30 ),/* Native Command Queueing */ -HOST_CAP_64 = (1 <<31 ),/* PCI DAC (64-bit DMA) support */ - -/* registers for each SATA port */ -PORT_LST_ADDR =0x00 ,/* command list DMA addr */ -PORT_LST_ADDR_HI =0x04 ,/* command list DMA addr hi */ -PORT_FIS_ADDR =0x08 ,/* FIS rx buf addr */ -PORT_FIS_ADDR_HI =0x0c ,/* FIS rx buf addr hi */ -PORT_IRQ_STAT =0x10 ,/* interrupt status */ -PORT_IRQ_MASK =0x14 ,/* interrupt enable/disable mask */ -PORT_CMD =0x18 ,/* port command */ -PORT_TFDATA =0x20 ,/* taskfile data */ -PORT_SIG =0x24 ,/* device TF signature */ -PORT_CMD_ISSUE =0x38 ,/* command issue */ -PORT_SCR =0x28 ,/* SATA phy register block */ -PORT_SCR_STAT =0x28 ,/* SATA phy register: SStatus */ -PORT_SCR_CTL =0x2c ,/* SATA phy register: SControl */ -PORT_SCR_ERR =0x30 ,/* SATA phy register: SError */ -PORT_SCR_ACT =0x34 ,/* SATA phy register: SActive */ - -/* PORT_IRQ_{STAT,MASK} bits */ -PORT_IRQ_COLD_PRES = (1 <<31 ),/* cold presence detect */ -PORT_IRQ_TF_ERR = (1 <<30 ),/* task file error */ -PORT_IRQ_HBUS_ERR = (1 <<29 ),/* host bus fatal error */ -PORT_IRQ_HBUS_DATA_ERR = (1 <<28 ),/* host bus data error */ -PORT_IRQ_IF_ERR = (1 <<27 ),/* interface fatal error */ -PORT_IRQ_IF_NONFATAL = (1 <<26 ),/* interface non-fatal error */ -PORT_IRQ_OVERFLOW = (1 <<24 ),/* xfer exhausted available S/G */ -PORT_IRQ_BAD_PMP = (1 <<23 ),/* incorrect port multiplier */ - -PORT_IRQ_PHYRDY = (1 <<22 ),/* PhyRdy changed */ -PORT_IRQ_DEV_ILCK = (1 <<7 ),/* device interlock */ -PORT_IRQ_CONNECT = (1 <<6 ),/* port connect change status */ -PORT_IRQ_SG_DONE = (1 <<5 ),/* descriptor processed */ -PORT_IRQ_UNK_FIS = (1 <<4 ),/* unknown FIS rx'd */ -PORT_IRQ_SDB_FIS = (1 <<3 ),/* Set Device Bits FIS rx'd */ -PORT_IRQ_DMAS_FIS = (1 <<2 ),/* DMA Setup FIS rx'd */ -PORT_IRQ_PIOS_FIS = (1 <<1 ),/* PIO Setup FIS rx'd */ -PORT_IRQ_D2H_REG_FIS = (1 <<0 ),/* D2H Register FIS rx'd */ - -PORT_IRQ_FREEZE =PORT_IRQ_HBUS_ERR | -PORT_IRQ_IF_ERR | -PORT_IRQ_CONNECT | -PORT_IRQ_PHYRDY | -PORT_IRQ_UNK_FIS , -PORT_IRQ_ERROR =PORT_IRQ_FREEZE | -PORT_IRQ_TF_ERR | -PORT_IRQ_HBUS_DATA_ERR , -DEF_PORT_IRQ =PORT_IRQ_ERROR |PORT_IRQ_SG_DONE | -PORT_IRQ_SDB_FIS |PORT_IRQ_DMAS_FIS | -PORT_IRQ_PIOS_FIS |PORT_IRQ_D2H_REG_FIS , - -/* PORT_CMD bits */ -PORT_CMD_ATAPI = (1 <<24 ),/* Device is ATAPI */ -PORT_CMD_LIST_ON = (1 <<15 ),/* cmd list DMA engine running */ -PORT_CMD_FIS_ON = (1 <<14 ),/* FIS DMA engine running */ -PORT_CMD_FIS_RX = (1 <<4 ),/* Enable FIS receive DMA engine */ -PORT_CMD_CLO = (1 <<3 ),/* Command list override */ -PORT_CMD_POWER_ON = (1 <<2 ),/* Power up device */ -PORT_CMD_SPIN_UP = (1 <<1 ),/* Spin up device */ -PORT_CMD_START = (1 <<0 ),/* Enable port DMA engine */ - -PORT_CMD_ICC_MASK = (0xf <<28 ),/* i/f ICC state mask */ -PORT_CMD_ICC_ACTIVE = (0x1 <<28 ),/* Put i/f in active state */ -PORT_CMD_ICC_PARTIAL = (0x2 <<28 ),/* Put i/f in partial state */ -PORT_CMD_ICC_SLUMBER = (0x6 <<28 ),/* Put i/f in slumber state */ - -/* ap->flags bits */ -AHCI_FLAG_NO_NCQ = (1 <<24 ), -AHCI_FLAG_IGN_IRQ_IF_ERR = (1 <<25 ),/* ignore IRQ_IF_ERR */ -AHCI_FLAG_HONOR_PI = (1 <<26 ),/* honor PORTS_IMPL */ -AHCI_FLAG_IGN_SERR_INTERNAL = (1 <<27 ),/* ignore SERR_INTERNAL */ -AHCI_FLAG_32BIT_ONLY = (1 <<28 ),/* force 32bit */ -}; - -enum { -ATA_SRST = (1 <<2 ),/* software reset */ -}; - -enum { -STATE_RUN =0 , -STATE_RESET -}; +#define AHCI_PCI_BAR 5 +#define AHCI_MAX_PORTS 32 +#define AHCI_MAX_SG 168/* hardware max is 64K */ +#define AHCI_DMA_BOUNDARY 0xffffffff +#define AHCI_USE_CLUSTERING 0 +#define AHCI_MAX_CMDS 32 +#define AHCI_CMD_SZ 32 +#define AHCI_CMD_SLOT_SZ (AHCI_MAX_CMDS * AHCI_CMD_SZ) +#define AHCI_RX_FIS_SZ 256 +#define AHCI_CMD_TBL_CDB 0x40 +#define AHCI_CMD_TBL_HDR_SZ 0x80 +#define AHCI_CMD_TBL_SZ (AHCI_CMD_TBL_HDR_SZ + (AHCI_MAX_SG * 16)) +#define AHCI_CMD_TBL_AR_SZ (AHCI_CMD_TBL_SZ * AHCI_MAX_CMDS) +#define AHCI_PORT_PRIV_DMA_SZ (AHCI_CMD_SLOT_SZ + AHCI_CMD_TBL_AR_SZ + AHCI_RX_FIS_SZ) + +#define AHCI_IRQ_ON_SG (1 << 31) +#define AHCI_CMD_ATAPI (1 << 5) +#define AHCI_CMD_WRITE (1 << 6) +#define AHCI_CMD_PREFETCH (1 << 7) +#define AHCI_CMD_RESET (1 << 8) +#define AHCI_CMD_CLR_BUSY (1 << 10) + +#define RX_FIS_D2H_REG 0x40/* offset of D2H Register FIS data */ +#define RX_FIS_SDB 0x58/* offset of SDB FIS data */ +#define RX_FIS_UNK 0x60/* offset of Unknown FIS data */ + +#define board_ahci 0 +#define board_ahci_pi 1 +#define board_ahci_vt8251 2 +#define board_ahci_ign_iferr 3 +#define board_ahci_sb600 4 + +/* global controller registers */ +#define HOST_CAP 0x00/* host capabilities */ +#define HOST_CTL 0x04/* global host control */ +#define HOST_IRQ_STAT 0x08/* interrupt status */ +#define HOST_PORTS_IMPL 0x0c/* bitmap of implemented ports */ +#define HOST_VERSION 0x10/* AHCI spec. version compliancy */ + +/* HOST_CTL bits */ +#define HOST_RESET (1 << 0)/* reset controller; self-clear */ +#define HOST_IRQ_EN (1 << 1)/* global IRQ enable */ +#define HOST_AHCI_EN (1 << 31)/* AHCI enabled */ + +/* HOST_CAP bits */ +#define HOST_CAP_SSC (1 << 14)/* Slumber capable */ +#define HOST_CAP_CLO (1 << 24)/* Command List Override support */ +#define HOST_CAP_SSS (1 << 27)/* Staggered Spin-up */ +#define HOST_CAP_NCQ (1 << 30)/* Native Command Queueing */ +#define HOST_CAP_64 (1 << 31)/* PCI DAC (64-bit DMA) support */ + +/* registers for each SATA port */ +#define PORT_LST_ADDR 0x00/* command list DMA addr */ +#define PORT_LST_ADDR_HI 0x04/* command list DMA addr hi */ +#define PORT_FIS_ADDR 0x08/* FIS rx buf addr */ +#define PORT_FIS_ADDR_HI 0x0c/* FIS rx buf addr hi */ +#define PORT_IRQ_STAT 0x10/* interrupt status */ +#define PORT_IRQ_MASK 0x14/* interrupt enable/disable mask */ +#define PORT_CMD 0x18/* port command */ +#define PORT_TFDATA 0x20/* taskfile data */ +#define PORT_SIG 0x24/* device TF signature */ +#define PORT_CMD_ISSUE 0x38/* command issue */ +#define PORT_SCR 0x28/* SATA phy register block */ +#define PORT_SCR_STAT 0x28/* SATA phy register: SStatus */ +#define PORT_SCR_CTL 0x2c/* SATA phy register: SControl */ +#define PORT_SCR_ERR 0x30/* SATA phy register: SError */ +#define PORT_SCR_ACT 0x34/* SATA phy register: SActive */ + +/* PORT_IRQ_{STAT,MASK} bits */ +#define PORT_IRQ_COLD_PRES (1 << 31)/* cold presence detect */ +#define PORT_IRQ_TF_ERR (1 << 30)/* task file error */ +#define PORT_IRQ_HBUS_ERR (1 << 29)/* host bus fatal error */ +#define PORT_IRQ_HBUS_DATA_ERR (1 << 28)/* host bus data error */ +#define PORT_IRQ_IF_ERR (1 << 27)/* interface fatal error */ +#define PORT_IRQ_IF_NONFATAL (1 << 26)/* interface non-fatal error */ +#define PORT_IRQ_OVERFLOW (1 << 24)/* xfer exhausted available S/G */ +#define PORT_IRQ_BAD_PMP (1 << 23)/* incorrect port multiplier */ + +#define PORT_IRQ_PHYRDY (1 << 22)/* PhyRdy changed */ +#define PORT_IRQ_DEV_ILCK (1 << 7)/* device interlock */ +#define PORT_IRQ_CONNECT (1 << 6)/* port connect change status */ +#define PORT_IRQ_SG_DONE (1 << 5)/* descriptor processed */ +#define PORT_IRQ_UNK_FIS (1 << 4)/* unknown FIS rx'd */ +#define PORT_IRQ_SDB_FIS (1 << 3)/* Set Device Bits FIS rx'd */ +#define PORT_IRQ_DMAS_FIS (1 << 2)/* DMA Setup FIS rx'd */ +#define PORT_IRQ_PIOS_FIS (1 << 1)/* PIO Setup FIS rx'd */ +#define PORT_IRQ_D2H_REG_FIS (1 << 0)/* D2H Register FIS rx'd */ + +#define PORT_IRQ_FREEZE (PORT_IRQ_HBUS_ERR | PORT_IRQ_IF_ERR | PORT_IRQ_CONNECT | PORT_IRQ_PHYRDY | PORT_IRQ_UNK_FIS) +#define PORT_IRQ_ERROR (PORT_IRQ_FREEZE | PORT_IRQ_TF_ERR | PORT_IRQ_HBUS_DATA_ERR) +#define DEF_PORT_IRQ (PORT_IRQ_ERROR | PORT_IRQ_SG_DONE | PORT_IRQ_SDB_FIS | PORT_IRQ_DMAS_FIS | PORT_IRQ_PIOS_FIS | PORT_IRQ_D2H_REG_FIS) + +/* PORT_CMD bits */ +#define PORT_CMD_ATAPI (1 << 24)/* Device is ATAPI */ +#define PORT_CMD_LIST_ON (1 << 15)/* cmd list DMA engine running */ +#define PORT_CMD_FIS_ON (1 << 14)/* FIS DMA engine running */ +#define PORT_CMD_FIS_RX (1 << 4)/* Enable FIS receive DMA engine */ +#define PORT_CMD_CLO (1 << 3)/* Command list override */ +#define PORT_CMD_POWER_ON (1 << 2)/* Power up device */ +#define PORT_CMD_SPIN_UP (1 << 1)/* Spin up device */ +#define PORT_CMD_START (1 << 0)/* Enable port DMA engine */ + +#define PORT_CMD_ICC_MASK (0xf << 28)/* i/f ICC state mask */ +#define PORT_CMD_ICC_ACTIVE (0x1 << 28)/* Put i/f in active state */ +#define PORT_CMD_ICC_PARTIAL (0x2 << 28)/* Put i/f in partial state */ +#define PORT_CMD_ICC_SLUMBER (0x6 << 28)/* Put i/f in slumber state */ + +/* ap->flags bits */ +#define AHCI_FLAG_NO_NCQ (1 << 24) +#define AHCI_FLAG_IGN_IRQ_IF_ERR (1 << 25)/* ignore IRQ_IF_ERR */ +#define AHCI_FLAG_HONOR_PI (1 << 26)/* honor PORTS_IMPL */ +#define AHCI_FLAG_IGN_SERR_INTERNAL (1 << 27)/* ignore SERR_INTERNAL */ +#define AHCI_FLAG_32BIT_ONLY (1 << 28)/* force 32bit */ + +#define ATA_SRST (1 << 2)/* software reset */ + +#define STATE_RUN 0 +#define STATE_RESET 1/* * ATA Commands (only mandatory commands listed here)
Quoted 1 line · Sebastian Herbszt
Convert enum to #define.
This doesn't buy you anything except code churn. It actually makes things worse at usual debug levels, too, because the debugger understands enums, but not #define.
-Nathan
Quoted 8 lines · Nathan Froyd
Quoted 1 line · Sebastian Herbszt
Convert enum to #define.
This doesn't buy you anything except code churn. It actually makes things worse at usual debug levels, too, because the debugger understands enums, but not #define.
-Nathan
Alex asked for this in http://lists.gnu.org/archive/html/qemu-devel/2010-05/msg00114.html
Sebastian