| Message ID | 20230629104821.194859-2-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | pc-bios/s390-ccw: Fixes and improvements for start.S (and other files) | expand |
On Thu, 29 Jun 2023 12:48:15 +0200 Thomas Huth <thuth@redhat.com> wrote: > From: Juan Quintela <quintela@redhat.com> > > Any good reason why this still exist? > I can understand u* and __u* to be linux kernel like, but ulong? shorter code? ¯\_(ツ)_/¯ > > Signed-off-by: Juan Quintela <quintela@redhat.com> > Message-Id: <20230510143925.4094-4-quintela@redhat.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com> > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > pc-bios/s390-ccw/helper.h | 2 +- > pc-bios/s390-ccw/s390-ccw.h | 7 +++---- > pc-bios/s390-ccw/virtio-scsi.h | 2 +- > pc-bios/s390-ccw/virtio.h | 4 ++-- > pc-bios/s390-ccw/virtio-blkdev.c | 12 ++++++------ > pc-bios/s390-ccw/virtio-scsi.c | 4 ++-- > pc-bios/s390-ccw/virtio.c | 12 ++++++------ > 7 files changed, 21 insertions(+), 22 deletions(-) > > diff --git a/pc-bios/s390-ccw/helper.h b/pc-bios/s390-ccw/helper.h > index 3d0731c4c6..8e3dfcb6d6 100644 > --- a/pc-bios/s390-ccw/helper.h > +++ b/pc-bios/s390-ccw/helper.h > @@ -38,7 +38,7 @@ static inline void yield(void) > > static inline void sleep(unsigned int seconds) > { > - ulong target = get_time_seconds() + seconds; > + unsigned long target = get_time_seconds() + seconds; > > while (get_time_seconds() < target) { > yield(); > diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h > index b88e0550ab..f849fba74b 100644 > --- a/pc-bios/s390-ccw/s390-ccw.h > +++ b/pc-bios/s390-ccw/s390-ccw.h > @@ -17,7 +17,6 @@ typedef unsigned char u8; > typedef unsigned short u16; > typedef unsigned int u32; > typedef unsigned long long u64; > -typedef unsigned long ulong; > typedef unsigned char __u8; > typedef unsigned short __u16; > typedef unsigned int __u32; > @@ -67,11 +66,11 @@ void sclp_get_loadparm_ascii(char *loadparm); > int sclp_read(char *str, size_t count); > > /* virtio.c */ > -unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2, > - ulong subchan_id, void *load_addr); > +unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long rec_list2, > + unsigned long subchan_id, void *load_addr); > bool virtio_is_supported(SubChannelId schid); > int virtio_blk_setup_device(SubChannelId schid); > -int virtio_read(ulong sector, void *load_addr); > +int virtio_read(unsigned long sector, void *load_addr); > > /* bootmap.c */ > void zipl_load(void); > diff --git a/pc-bios/s390-ccw/virtio-scsi.h b/pc-bios/s390-ccw/virtio-scsi.h > index e6b6cd4815..c5612e16a2 100644 > --- a/pc-bios/s390-ccw/virtio-scsi.h > +++ b/pc-bios/s390-ccw/virtio-scsi.h > @@ -68,7 +68,7 @@ static inline bool virtio_scsi_response_ok(const VirtioScsiCmdResp *r) > } > > int virtio_scsi_read_many(VDev *vdev, > - ulong sector, void *load_addr, int sec_num); > + unsigned long sector, void *load_addr, int sec_num); > int virtio_scsi_setup_device(SubChannelId schid); > > #endif /* VIRTIO_SCSI_H */ > diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h > index e657d381ec..85bd9d1695 100644 > --- a/pc-bios/s390-ccw/virtio.h > +++ b/pc-bios/s390-ccw/virtio.h > @@ -190,14 +190,14 @@ int virtio_get_block_size(void); > uint8_t virtio_get_heads(void); > uint8_t virtio_get_sectors(void); > uint64_t virtio_get_blocks(void); > -int virtio_read_many(ulong sector, void *load_addr, int sec_num); > +int virtio_read_many(unsigned long sector, void *load_addr, int sec_num); > > #define VIRTIO_SECTOR_SIZE 512 > #define VIRTIO_ISO_BLOCK_SIZE 2048 > #define VIRTIO_SCSI_BLOCK_SIZE 512 > #define VIRTIO_DASD_DEFAULT_BLOCK_SIZE 4096 > > -static inline ulong virtio_sector_adjust(ulong sector) > +static inline unsigned long virtio_sector_adjust(unsigned long sector) > { > return sector * (virtio_get_block_size() / VIRTIO_SECTOR_SIZE); > } > diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blkdev.c > index 794f99b42c..a81207b52e 100644 > --- a/pc-bios/s390-ccw/virtio-blkdev.c > +++ b/pc-bios/s390-ccw/virtio-blkdev.c > @@ -16,7 +16,7 @@ > #define VIRTIO_BLK_F_GEOMETRY (1 << 4) > #define VIRTIO_BLK_F_BLK_SIZE (1 << 6) > > -static int virtio_blk_read_many(VDev *vdev, ulong sector, void *load_addr, > +static int virtio_blk_read_many(VDev *vdev, unsigned long sector, void *load_addr, > int sec_num) > { > VirtioBlkOuthdr out_hdr; > @@ -49,7 +49,7 @@ static int virtio_blk_read_many(VDev *vdev, ulong sector, void *load_addr, > return status; > } > > -int virtio_read_many(ulong sector, void *load_addr, int sec_num) > +int virtio_read_many(unsigned long sector, void *load_addr, int sec_num) > { > VDev *vdev = virtio_get_device(); > > @@ -63,14 +63,14 @@ int virtio_read_many(ulong sector, void *load_addr, int sec_num) > return -1; > } > > -unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2, > - ulong subchan_id, void *load_addr) > +unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long rec_list2, > + unsigned long subchan_id, void *load_addr) > { > u8 status; > int sec = rec_list1; > int sec_num = ((rec_list2 >> 32) & 0xffff) + 1; > int sec_len = rec_list2 >> 48; > - ulong addr = (ulong)load_addr; > + unsigned long addr = (unsigned long)load_addr; > > if (sec_len != virtio_get_block_size()) { > return -1; > @@ -86,7 +86,7 @@ unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2, > return addr; > } > > -int virtio_read(ulong sector, void *load_addr) > +int virtio_read(unsigned long sector, void *load_addr) > { > return virtio_read_many(sector, load_addr, 1); > } > diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c > index dcce696a33..d1a84b937c 100644 > --- a/pc-bios/s390-ccw/virtio-scsi.c > +++ b/pc-bios/s390-ccw/virtio-scsi.c > @@ -150,7 +150,7 @@ static bool scsi_report_luns(VDev *vdev, void *data, uint32_t data_size) > } > > static bool scsi_read_10(VDev *vdev, > - ulong sector, int sectors, void *data, > + unsigned long sector, int sectors, void *data, > unsigned int data_size) > { > ScsiCdbRead10 cdb = { > @@ -269,7 +269,7 @@ static int virtio_scsi_locate_device(VDev *vdev) > } > > int virtio_scsi_read_many(VDev *vdev, > - ulong sector, void *load_addr, int sec_num) > + unsigned long sector, void *load_addr, int sec_num) > { > int sector_count; > int f = vdev->blk_factor; > diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c > index f37510f312..5edd058d88 100644 > --- a/pc-bios/s390-ccw/virtio.c > +++ b/pc-bios/s390-ccw/virtio.c > @@ -48,10 +48,10 @@ VirtioDevType virtio_get_device_type(void) > static long kvm_hypercall(unsigned long nr, unsigned long param1, > unsigned long param2, unsigned long param3) > { > - register ulong r_nr asm("1") = nr; > - register ulong r_param1 asm("2") = param1; > - register ulong r_param2 asm("3") = param2; > - register ulong r_param3 asm("4") = param3; > + register unsigned long r_nr asm("1") = nr; > + register unsigned long r_param1 asm("2") = param1; > + register unsigned long r_param2 asm("3") = param2; > + register unsigned long r_param3 asm("4") = param3; > register long retval asm("2"); > > asm volatile ("diag %%r2,%%r4,0x500" > @@ -145,7 +145,7 @@ void vring_send_buf(VRing *vr, void *p, int len, int flags) > vr->avail->ring[vr->avail->idx % vr->num] = vr->next_idx; > } > > - vr->desc[vr->next_idx].addr = (ulong)p; > + vr->desc[vr->next_idx].addr = (unsigned long)p; > vr->desc[vr->next_idx].len = len; > vr->desc[vr->next_idx].flags = flags & ~VRING_HIDDEN_IS_CHAIN; > vr->desc[vr->next_idx].next = vr->next_idx; > @@ -182,7 +182,7 @@ int vr_poll(VRing *vr) > */ > int vring_wait_reply(void) > { > - ulong target_second = get_time_seconds() + vdev.wait_reply_timeout; > + unsigned long target_second = get_time_seconds() + vdev.wait_reply_timeout; > > /* Wait for any queue to be updated by the host */ > do {
On 29/6/23 12:48, Thomas Huth wrote: > From: Juan Quintela <quintela@redhat.com> > > Any good reason why this still exist? > I can understand u* and __u* to be linux kernel like, but ulong? > > Signed-off-by: Juan Quintela <quintela@redhat.com> > Message-Id: <20230510143925.4094-4-quintela@redhat.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > pc-bios/s390-ccw/helper.h | 2 +- > pc-bios/s390-ccw/s390-ccw.h | 7 +++---- > pc-bios/s390-ccw/virtio-scsi.h | 2 +- > pc-bios/s390-ccw/virtio.h | 4 ++-- > pc-bios/s390-ccw/virtio-blkdev.c | 12 ++++++------ > pc-bios/s390-ccw/virtio-scsi.c | 4 ++-- > pc-bios/s390-ccw/virtio.c | 12 ++++++------ > 7 files changed, 21 insertions(+), 22 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/pc-bios/s390-ccw/helper.h b/pc-bios/s390-ccw/helper.h index 3d0731c4c6..8e3dfcb6d6 100644 --- a/pc-bios/s390-ccw/helper.h +++ b/pc-bios/s390-ccw/helper.h @@ -38,7 +38,7 @@ static inline void yield(void) static inline void sleep(unsigned int seconds) { - ulong target = get_time_seconds() + seconds; + unsigned long target = get_time_seconds() + seconds; while (get_time_seconds() < target) { yield(); diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h index b88e0550ab..f849fba74b 100644 --- a/pc-bios/s390-ccw/s390-ccw.h +++ b/pc-bios/s390-ccw/s390-ccw.h @@ -17,7 +17,6 @@ typedef unsigned char u8; typedef unsigned short u16; typedef unsigned int u32; typedef unsigned long long u64; -typedef unsigned long ulong; typedef unsigned char __u8; typedef unsigned short __u16; typedef unsigned int __u32; @@ -67,11 +66,11 @@ void sclp_get_loadparm_ascii(char *loadparm); int sclp_read(char *str, size_t count); /* virtio.c */ -unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2, - ulong subchan_id, void *load_addr); +unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long rec_list2, + unsigned long subchan_id, void *load_addr); bool virtio_is_supported(SubChannelId schid); int virtio_blk_setup_device(SubChannelId schid); -int virtio_read(ulong sector, void *load_addr); +int virtio_read(unsigned long sector, void *load_addr); /* bootmap.c */ void zipl_load(void); diff --git a/pc-bios/s390-ccw/virtio-scsi.h b/pc-bios/s390-ccw/virtio-scsi.h index e6b6cd4815..c5612e16a2 100644 --- a/pc-bios/s390-ccw/virtio-scsi.h +++ b/pc-bios/s390-ccw/virtio-scsi.h @@ -68,7 +68,7 @@ static inline bool virtio_scsi_response_ok(const VirtioScsiCmdResp *r) } int virtio_scsi_read_many(VDev *vdev, - ulong sector, void *load_addr, int sec_num); + unsigned long sector, void *load_addr, int sec_num); int virtio_scsi_setup_device(SubChannelId schid); #endif /* VIRTIO_SCSI_H */ diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h index e657d381ec..85bd9d1695 100644 --- a/pc-bios/s390-ccw/virtio.h +++ b/pc-bios/s390-ccw/virtio.h @@ -190,14 +190,14 @@ int virtio_get_block_size(void); uint8_t virtio_get_heads(void); uint8_t virtio_get_sectors(void); uint64_t virtio_get_blocks(void); -int virtio_read_many(ulong sector, void *load_addr, int sec_num); +int virtio_read_many(unsigned long sector, void *load_addr, int sec_num); #define VIRTIO_SECTOR_SIZE 512 #define VIRTIO_ISO_BLOCK_SIZE 2048 #define VIRTIO_SCSI_BLOCK_SIZE 512 #define VIRTIO_DASD_DEFAULT_BLOCK_SIZE 4096 -static inline ulong virtio_sector_adjust(ulong sector) +static inline unsigned long virtio_sector_adjust(unsigned long sector) { return sector * (virtio_get_block_size() / VIRTIO_SECTOR_SIZE); } diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blkdev.c index 794f99b42c..a81207b52e 100644 --- a/pc-bios/s390-ccw/virtio-blkdev.c +++ b/pc-bios/s390-ccw/virtio-blkdev.c @@ -16,7 +16,7 @@ #define VIRTIO_BLK_F_GEOMETRY (1 << 4) #define VIRTIO_BLK_F_BLK_SIZE (1 << 6) -static int virtio_blk_read_many(VDev *vdev, ulong sector, void *load_addr, +static int virtio_blk_read_many(VDev *vdev, unsigned long sector, void *load_addr, int sec_num) { VirtioBlkOuthdr out_hdr; @@ -49,7 +49,7 @@ static int virtio_blk_read_many(VDev *vdev, ulong sector, void *load_addr, return status; } -int virtio_read_many(ulong sector, void *load_addr, int sec_num) +int virtio_read_many(unsigned long sector, void *load_addr, int sec_num) { VDev *vdev = virtio_get_device(); @@ -63,14 +63,14 @@ int virtio_read_many(ulong sector, void *load_addr, int sec_num) return -1; } -unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2, - ulong subchan_id, void *load_addr) +unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long rec_list2, + unsigned long subchan_id, void *load_addr) { u8 status; int sec = rec_list1; int sec_num = ((rec_list2 >> 32) & 0xffff) + 1; int sec_len = rec_list2 >> 48; - ulong addr = (ulong)load_addr; + unsigned long addr = (unsigned long)load_addr; if (sec_len != virtio_get_block_size()) { return -1; @@ -86,7 +86,7 @@ unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2, return addr; } -int virtio_read(ulong sector, void *load_addr) +int virtio_read(unsigned long sector, void *load_addr) { return virtio_read_many(sector, load_addr, 1); } diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c index dcce696a33..d1a84b937c 100644 --- a/pc-bios/s390-ccw/virtio-scsi.c +++ b/pc-bios/s390-ccw/virtio-scsi.c @@ -150,7 +150,7 @@ static bool scsi_report_luns(VDev *vdev, void *data, uint32_t data_size) } static bool scsi_read_10(VDev *vdev, - ulong sector, int sectors, void *data, + unsigned long sector, int sectors, void *data, unsigned int data_size) { ScsiCdbRead10 cdb = { @@ -269,7 +269,7 @@ static int virtio_scsi_locate_device(VDev *vdev) } int virtio_scsi_read_many(VDev *vdev, - ulong sector, void *load_addr, int sec_num) + unsigned long sector, void *load_addr, int sec_num) { int sector_count; int f = vdev->blk_factor; diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index f37510f312..5edd058d88 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -48,10 +48,10 @@ VirtioDevType virtio_get_device_type(void) static long kvm_hypercall(unsigned long nr, unsigned long param1, unsigned long param2, unsigned long param3) { - register ulong r_nr asm("1") = nr; - register ulong r_param1 asm("2") = param1; - register ulong r_param2 asm("3") = param2; - register ulong r_param3 asm("4") = param3; + register unsigned long r_nr asm("1") = nr; + register unsigned long r_param1 asm("2") = param1; + register unsigned long r_param2 asm("3") = param2; + register unsigned long r_param3 asm("4") = param3; register long retval asm("2"); asm volatile ("diag %%r2,%%r4,0x500" @@ -145,7 +145,7 @@ void vring_send_buf(VRing *vr, void *p, int len, int flags) vr->avail->ring[vr->avail->idx % vr->num] = vr->next_idx; } - vr->desc[vr->next_idx].addr = (ulong)p; + vr->desc[vr->next_idx].addr = (unsigned long)p; vr->desc[vr->next_idx].len = len; vr->desc[vr->next_idx].flags = flags & ~VRING_HIDDEN_IS_CHAIN; vr->desc[vr->next_idx].next = vr->next_idx; @@ -182,7 +182,7 @@ int vr_poll(VRing *vr) */ int vring_wait_reply(void) { - ulong target_second = get_time_seconds() + vdev.wait_reply_timeout; + unsigned long target_second = get_time_seconds() + vdev.wait_reply_timeout; /* Wait for any queue to be updated by the host */ do {