Skip to contentSkip to conversation

usb: storage: fix capacity detection on 64 bit systems

PATCH In review Peter Mamonov 2 participants 3 messages Apr 17, 2019 – Apr 18, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: storage: fix capacity detection on 64 bit systems

---
 drivers/usb/storage/usb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/storage/usb.c +2 -2
index 8218bb2a71..18f69f8478 100644
@@ -316,7 +316,7 @@ static int usb_stor_init_blkdev(struct us_blk_dev *pblk_dev)
 {
 	struct us_data *us = pblk_dev->us;
 	ccb us_ccb;
-	unsigned long *pcap;
+	u32 *pcap;
 	int result = 0;
 
 	us_ccb.pdata = us_io_buf;
@@ -357,7 +357,7 @@ static int usb_stor_init_blkdev(struct us_blk_dev *pblk_dev)
 		result = -EIO;
 		goto Exit;
 	}
-	pcap = (unsigned long *)us_ccb.pdata;
+	pcap = (u32 *)us_ccb.pdata;
 	US_DEBUGP("Read Capacity returns: 0x%lx, 0x%lx\n", pcap[0], pcap[1]);
 	pblk_dev->blk.num_blocks = usb_limit_blk_cnt(be32_to_cpu(pcap[0]) + 1);
 	if (be32_to_cpu(pcap[1]) != SECTOR_SIZE)
Signature · 7 lines
2.20.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw
Quoted 1 line · Peter Mamonov

Peter:

This was fixed in
http://lists.infradead.org/pipermail/barebox/2019-March/037526.html.
Latest next should contain that patch.

Thanks,
Andrey Smirnov

Quoted 31 lines
---
 drivers/usb/storage/usb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/storage/usb.c +2 -3
index 8218bb2a71..18f69f8478 100644
@@ -316,7 +316,7 @@ static int usb_stor_init_blkdev(struct us_blk_dev *pblk_dev)
 {
        struct us_data *us = pblk_dev->us;
        ccb us_ccb;
-       unsigned long *pcap;
+       u32 *pcap;
        int result = 0;
 
        us_ccb.pdata = us_io_buf;
@@ -357,7 +357,7 @@ static int usb_stor_init_blkdev(struct us_blk_dev *pblk_dev)
                result = -EIO;
                goto Exit;
        }
-       pcap = (unsigned long *)us_ccb.pdata;
+       pcap = (u32 *)us_ccb.pdata;
        US_DEBUGP("Read Capacity returns: 0x%lx, 0x%lx\n", pcap[0], pcap[1]);
        pblk_dev->blk.num_blocks = usb_limit_blk_cnt(be32_to_cpu(pcap[0]) + 1);
        if (be32_to_cpu(pcap[1]) != SECTOR_SIZE)
--

2.20.1

Quoted 4 lines

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

#2 lore raw

Hi, Andrey,

Quoted 8 lines · Andrey Smirnov
Quoted 1 line · Peter Mamonov

Peter:

This was fixed in
http://lists.infradead.org/pipermail/barebox/2019-March/037526.html.
Latest next should contain that patch.

Sorry, I missed this message as well as %lx in my patch :)

Thanks,
Peter

Quoted 35 lines

Thanks,
Andrey Smirnov

Quoted 31 lines
---
 drivers/usb/storage/usb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/storage/usb.c +2 -3
index 8218bb2a71..18f69f8478 100644
@@ -316,7 +316,7 @@ static int usb_stor_init_blkdev(struct us_blk_dev *pblk_dev)
 {
        struct us_data *us = pblk_dev->us;
        ccb us_ccb;
-       unsigned long *pcap;
+       u32 *pcap;
        int result = 0;
 
        us_ccb.pdata = us_io_buf;
@@ -357,7 +357,7 @@ static int usb_stor_init_blkdev(struct us_blk_dev *pblk_dev)
                result = -EIO;
                goto Exit;
        }
-       pcap = (unsigned long *)us_ccb.pdata;
+       pcap = (u32 *)us_ccb.pdata;
        US_DEBUGP("Read Capacity returns: 0x%lx, 0x%lx\n", pcap[0], pcap[1]);
        pblk_dev->blk.num_blocks = usb_limit_blk_cnt(be32_to_cpu(pcap[0]) + 1);
        if (be32_to_cpu(pcap[1]) != SECTOR_SIZE)
--

2.20.1

Quoted 4 lines
Quoted 4 lines

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox