haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse source 
iQIcBAABAgAGBQJaYnG/AAoJEH3vgQaq/DkOc6UP/2WDSuDSg9CIX4IUem00d8wc
 lawi9haQurb4n8ykTlHarSCFuOrbJwGJrYifaEC7tWr+CQHsPKTPDyRxf63zV7bp
 e9ypIQdfVLQoqrIM8WEV2RNLReNbPCRi8efrZr+T0+EGuspeTI7bJEf/yLaM6gHS
 EQ3MU2GJvb5f2XFanKeQe0YiZqVdbIprtsfY2NaQhN6sQPbl+5Z+UsMijLXn/bi+
 jxKk72UXdFHbWyG435NypjtUiheIlNvdbVGtI4a8DOu/v6YbQY9cLXLTcnWe2DWY
 ioF/7zlpC6m6g+6W7pIVTYtCObTdA9Jv+7pCZZ8KzBjVzItmEYNBgL/4cd5WMukL
 a2HigkUQpbtfma6ngl1nH+n4lD9ygRNI9EVfErU/48eYOV5plyeuZfzncJor2OPJ
 uk9LWD9jCuRV9msQHJoRwF2VizebDipQwihBJZYziGl8VyeOnI03Yxb1H4Ng4DHn
 kv2BJNTtCFwhuWv7pGBhrn92oTYDfke5kW8kN8arx8m4bCY9QJjjPNpGCUbxNc6m
 RLNvJ9BbiJBNAkFoA/Jpg/SNO6H+FqCIJ5foIqWgnGiDG3QSBFjMwVXuNWOo31jE
 MCnrJG3otT/qL/QA9ngLk3PCBlgu1H49NOhxmw7QAm19/efgU8pYIvIEkmSS1qLJ
 V5E76q6yB3NlC26nDvws
 =HyAo
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

# gpg: Signature made Fri 19 Jan 2018 22:31:27 GMT
# gpg:                using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  hw/ide: Remove duplicated definitions from ahci_internal.h
  ide: abort TRIM operation for invalid range
  ide: move ide_sect_range_ok() up
  ide: pass IDEState to trim AIO callback

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-01-22 10:32:58 +00:00
parent b384cd95eb 3161906df8
commit f7c6b96c3e
3 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hw/ide/ahci_internal.h
View file

@ -311,8 +311,6 @@ struct AHCIPCIState {
AHCIState ahci;
};
#define TYPE_ICH9_AHCI "ich9-ahci"
#define ICH_AHCI(obj) \
OBJECT_CHECK(AHCIPCIState, (obj), TYPE_ICH9_AHCI)
@ -375,10 +373,8 @@ void ahci_uninit(AHCIState *s);
void ahci_reset(AHCIState *s);
#define TYPE_SYSBUS_AHCI "sysbus-ahci"
#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI)
#define TYPE_ALLWINNER_AHCI "allwinner-ahci"
#define ALLWINNER_AHCI(obj) OBJECT_CHECK(AllwinnerAHCIState, (obj), \
TYPE_ALLWINNER_AHCI)

53
hw/ide/core.c
View file

@ -380,14 +380,27 @@ static void ide_set_signature(IDEState *s)
}
}
static bool ide_sect_range_ok(IDEState *s,
uint64_t sector, uint64_t nb_sectors)
{
uint64_t total_sectors;
blk_get_geometry(s->blk, &total_sectors);
if (sector > total_sectors || nb_sectors > total_sectors - sector) {
return false;
}
return true;
}
typedef struct TrimAIOCB {
BlockAIOCB common;
BlockBackend *blk;
IDEState *s;
QEMUBH *bh;
int ret;
QEMUIOVector *qiov;
BlockAIOCB *aiocb;
int i, j;
bool is_invalid;
} TrimAIOCB;
static void trim_aio_cancel(BlockAIOCB *acb)
@ -415,8 +428,11 @@ static void ide_trim_bh_cb(void *opaque)
{
TrimAIOCB *iocb = opaque;
iocb->common.cb(iocb->common.opaque, iocb->ret);
if (iocb->is_invalid) {
ide_dma_error(iocb->s);
} else {
iocb->common.cb(iocb->common.opaque, iocb->ret);
}
qemu_bh_delete(iocb->bh);
iocb->bh = NULL;
qemu_aio_unref(iocb);
@ -425,6 +441,8 @@ static void ide_trim_bh_cb(void *opaque)
static void ide_issue_trim_cb(void *opaque, int ret)
{
TrimAIOCB *iocb = opaque;
IDEState *s = iocb->s;
if (ret >= 0) {
while (iocb->j < iocb->qiov->niov) {
int j = iocb->j;
@ -441,8 +459,13 @@ static void ide_issue_trim_cb(void *opaque, int ret)
continue;
}
if (!ide_sect_range_ok(s, sector, count)) {
iocb->is_invalid = true;
goto done;
}
/* Got an entry! Submit and exit. */
iocb->aiocb = blk_aio_pdiscard(iocb->blk,
iocb->aiocb = blk_aio_pdiscard(s->blk,
sector << BDRV_SECTOR_BITS,
count << BDRV_SECTOR_BITS,
ide_issue_trim_cb, opaque);
@ -456,6 +479,7 @@ static void ide_issue_trim_cb(void *opaque, int ret)
iocb->ret = ret;
}
done:
iocb->aiocb = NULL;
if (iocb->bh) {
qemu_bh_schedule(iocb->bh);
@ -466,16 +490,17 @@ BlockAIOCB *ide_issue_trim(
int64_t offset, QEMUIOVector *qiov,
BlockCompletionFunc *cb, void *cb_opaque, void *opaque)
{
BlockBackend *blk = opaque;
IDEState *s = opaque;
TrimAIOCB *iocb;
iocb = blk_aio_get(&trim_aiocb_info, blk, cb, cb_opaque);
iocb->blk = blk;
iocb = blk_aio_get(&trim_aiocb_info, s->blk, cb, cb_opaque);
iocb->s = s;
iocb->bh = qemu_bh_new(ide_trim_bh_cb, iocb);
iocb->ret = 0;
iocb->qiov = qiov;
iocb->i = -1;
iocb->j = 0;
iocb->is_invalid = false;
ide_issue_trim_cb(iocb, 0);
return &iocb->common;
}
@ -601,18 +626,6 @@ static void ide_rw_error(IDEState *s) {
ide_set_irq(s->bus);
}
static bool ide_sect_range_ok(IDEState *s,
uint64_t sector, uint64_t nb_sectors)
{
uint64_t total_sectors;
blk_get_geometry(s->blk, &total_sectors);
if (sector > total_sectors || nb_sectors > total_sectors - sector) {
return false;
}
return true;
}
static void ide_buffered_readv_cb(void *opaque, int ret)
{
IDEBufferedRequest *req = opaque;
@ -900,7 +913,7 @@ static void ide_dma_cb(void *opaque, int ret)
case IDE_DMA_TRIM:
s->bus->dma->aiocb = dma_blk_io(blk_get_aio_context(s->blk),
&s->sg, offset, BDRV_SECTOR_SIZE,
ide_issue_trim, s->blk, ide_dma_cb, s,
ide_issue_trim, s, ide_dma_cb, s,
DMA_DIRECTION_TO_DEVICE);
break;
default:

6
include/hw/ide/ahci.h
View file

@ -54,14 +54,10 @@ typedef struct AHCIPCIState AHCIPCIState;
#define TYPE_ICH9_AHCI "ich9-ahci"
#define ICH_AHCI(obj) \
OBJECT_CHECK(AHCIPCIState, (obj), TYPE_ICH9_AHCI)
int32_t ahci_get_num_ports(PCIDevice *dev);
void ahci_ide_create_devs(PCIDevice *dev, DriveInfo **hd);
#define TYPE_SYSBUS_AHCI "sysbus-ahci"
#define SYSBUS_AHCI(obj) OBJECT_CHECK(SysbusAHCIState, (obj), TYPE_SYSBUS_AHCI)
typedef struct SysbusAHCIState {
/*< private >*/
@ -73,8 +69,6 @@ typedef struct SysbusAHCIState {
} SysbusAHCIState;
#define TYPE_ALLWINNER_AHCI "allwinner-ahci"
#define ALLWINNER_AHCI(obj) OBJECT_CHECK(AllwinnerAHCIState, (obj), \
TYPE_ALLWINNER_AHCI)
#define ALLWINNER_AHCI_MMIO_OFF 0x80
#define ALLWINNER_AHCI_MMIO_SIZE 0x80