mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/sd/aspeed_sdhci: Introduce Capabilities Register 2 for SD slot 0 and 1

Browse Source 
The size of SDHCI capabilities register is 64bits, so introduces new
Capabilities Register 2 for SD slot 0 (0x144) and SD slot1 (0x244).

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
[ clg: Fixed code alignment ]
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Jamin Lin 2024-10-29 17:17:27 +08:00 committed by Cédric Le Goater
parent d3d6def468
commit 53b3169269
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/sd/aspeed_sdhci.c
View File

@ -24,8 +24,10 @@
#define ASPEED_SDHCI_DEBOUNCE_RESET 0x00000005 #define ASPEED_SDHCI_DEBOUNCE_RESET 0x00000005
#define ASPEED_SDHCI_BUS 0x08 #define ASPEED_SDHCI_BUS 0x08
#define ASPEED_SDHCI_SDIO_140 0x10 #define ASPEED_SDHCI_SDIO_140 0x10
#define ASPEED_SDHCI_SDIO_144 0x14
#define ASPEED_SDHCI_SDIO_148 0x18 #define ASPEED_SDHCI_SDIO_148 0x18
#define ASPEED_SDHCI_SDIO_240 0x20 #define ASPEED_SDHCI_SDIO_240 0x20
#define ASPEED_SDHCI_SDIO_244 0x24
#define ASPEED_SDHCI_SDIO_248 0x28 #define ASPEED_SDHCI_SDIO_248 0x28
#define ASPEED_SDHCI_WP_POL 0xec #define ASPEED_SDHCI_WP_POL 0xec
#define ASPEED_SDHCI_CARD_DET 0xf0 #define ASPEED_SDHCI_CARD_DET 0xf0
@ -35,21 +37,27 @@
static uint64_t aspeed_sdhci_read(void *opaque, hwaddr addr, unsigned int size) static uint64_t aspeed_sdhci_read(void *opaque, hwaddr addr, unsigned int size)
{ {
uint32_t val = 0; uint64_t val = 0;
AspeedSDHCIState *sdhci = opaque; AspeedSDHCIState *sdhci = opaque;
switch (addr) { switch (addr) {
case ASPEED_SDHCI_SDIO_140: case ASPEED_SDHCI_SDIO_140:
val = (uint32_t)sdhci->slots[0].capareg; val = extract64(sdhci->slots[0].capareg, 0, 32);
break;
case ASPEED_SDHCI_SDIO_144:
val = extract64(sdhci->slots[0].capareg, 32, 32);
break; break;
case ASPEED_SDHCI_SDIO_148: case ASPEED_SDHCI_SDIO_148:
val = (uint32_t)sdhci->slots[0].maxcurr; val = extract64(sdhci->slots[0].maxcurr, 0, 32);
break; break;
case ASPEED_SDHCI_SDIO_240: case ASPEED_SDHCI_SDIO_240:
val = (uint32_t)sdhci->slots[1].capareg; val = extract64(sdhci->slots[1].capareg, 0, 32);
break;
case ASPEED_SDHCI_SDIO_244:
val = extract64(sdhci->slots[1].capareg, 32, 32);
break; break;
case ASPEED_SDHCI_SDIO_248: case ASPEED_SDHCI_SDIO_248:
val = (uint32_t)sdhci->slots[1].maxcurr; val = extract64(sdhci->slots[1].maxcurr, 0, 32);
break; break;
default: default:
if (addr < ASPEED_SDHCI_REG_SIZE) { if (addr < ASPEED_SDHCI_REG_SIZE) {
@ -61,9 +69,9 @@ static uint64_t aspeed_sdhci_read(void *opaque, hwaddr addr, unsigned int size)
} }
} }
trace_aspeed_sdhci_read(addr, size, (uint64_t) val); trace_aspeed_sdhci_read(addr, size, val);
return (uint64_t)val; return val;
} }
static void aspeed_sdhci_write(void *opaque, hwaddr addr, uint64_t val, static void aspeed_sdhci_write(void *opaque, hwaddr addr, uint64_t val,
@ -79,16 +87,26 @@ static void aspeed_sdhci_write(void *opaque, hwaddr addr, uint64_t val,
sdhci->regs[TO_REG(addr)] = (uint32_t)val & ~ASPEED_SDHCI_INFO_RESET; sdhci->regs[TO_REG(addr)] = (uint32_t)val & ~ASPEED_SDHCI_INFO_RESET;
break; break;
case ASPEED_SDHCI_SDIO_140: case ASPEED_SDHCI_SDIO_140:
sdhci->slots[0].capareg = (uint64_t)(uint32_t)val; sdhci->slots[0].capareg = deposit64(sdhci->slots[0].capareg, 0, 32, val);
break;
case ASPEED_SDHCI_SDIO_144:
sdhci->slots[0].capareg = deposit64(sdhci->slots[0].capareg, 32, 32, val);
break; break;
case ASPEED_SDHCI_SDIO_148: case ASPEED_SDHCI_SDIO_148:
sdhci->slots[0].maxcurr = (uint64_t)(uint32_t)val; sdhci->slots[0].maxcurr = deposit64(sdhci->slots[0].maxcurr,
0, 32, val);
break; break;
case ASPEED_SDHCI_SDIO_240: case ASPEED_SDHCI_SDIO_240:
sdhci->slots[1].capareg = (uint64_t)(uint32_t)val; sdhci->slots[1].capareg = deposit64(sdhci->slots[1].capareg,
0, 32, val);
break;
case ASPEED_SDHCI_SDIO_244:
sdhci->slots[1].capareg = deposit64(sdhci->slots[1].capareg,
32, 32, val);
break; break;
case ASPEED_SDHCI_SDIO_248: case ASPEED_SDHCI_SDIO_248:
sdhci->slots[1].maxcurr = (uint64_t)(uint32_t)val; sdhci->slots[1].maxcurr = deposit64(sdhci->slots[0].maxcurr,
0, 32, val);
break; break;
default: default:
if (addr < ASPEED_SDHCI_REG_SIZE) { if (addr < ASPEED_SDHCI_REG_SIZE) {