Skip to content

L
linux
Commit 8d93f69f authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] USB storage: Enhance sddr09 to work with 64 MB SmartMedia cards 

This patch was written by Andries Brouwer.  It adds to sddr09 the ability
to use 64 MB SmartMedia cards.  I have added a few minor alterations to
make it fit in with my sequence of other patches.
parent a01e2e63
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 56 deletions
drivers/usb/storage/sddr09.c
View file @ 8d93f69f
...@@ -66,7 +66,7 @@ struct nand_flash_dev { ...@@ -66,7 +66,7 @@ struct nand_flash_dev {
* NAND Flash Manufacturer ID Codes * NAND Flash Manufacturer ID Codes
*/ */
#define NAND_MFR_AMD 0x01 #define NAND_MFR_AMD 0x01
#define NAND_MFR_NS 0x8f #define NAND_MFR_NATSEMI 0x8f
#define NAND_MFR_TOSHIBA 0x98 #define NAND_MFR_TOSHIBA 0x98
#define NAND_MFR_SAMSUNG 0xec #define NAND_MFR_SAMSUNG 0xec
...@@ -74,8 +74,8 @@ static inline char *nand_flash_manufacturer(int manuf_id) { ...@@ -74,8 +74,8 @@ static inline char *nand_flash_manufacturer(int manuf_id) {
switch(manuf_id) { switch(manuf_id) {
case NAND_MFR_AMD: case NAND_MFR_AMD:
return "AMD"; return "AMD";
case NAND_MFR_NS: case NAND_MFR_NATSEMI:
return "NS"; return "NATSEMI";
case NAND_MFR_TOSHIBA: case NAND_MFR_TOSHIBA:
return "Toshiba"; return "Toshiba";
case NAND_MFR_SAMSUNG: case NAND_MFR_SAMSUNG:
...@@ -302,8 +302,7 @@ sddr09_request_sense(struct us_data *us, unsigned char *sensebuf, int buflen) { ...@@ -302,8 +302,7 @@ sddr09_request_sense(struct us_data *us, unsigned char *sensebuf, int buflen) {
if (result != USB_STOR_XFER_GOOD) { if (result != USB_STOR_XFER_GOOD) {
US_DEBUGP("request sense bulk in failed\n"); US_DEBUGP("request sense bulk in failed\n");
return USB_STOR_TRANSPORT_ERROR; return USB_STOR_TRANSPORT_ERROR;
} } else {
else {
US_DEBUGP("request sense worked\n"); US_DEBUGP("request sense worked\n");
return USB_STOR_TRANSPORT_GOOD; return USB_STOR_TRANSPORT_GOOD;
} }
...@@ -469,6 +468,8 @@ sddr09_erase(struct us_data *us, unsigned long Eaddress) { ...@@ -469,6 +468,8 @@ sddr09_erase(struct us_data *us, unsigned long Eaddress) {
unsigned char *command = us->iobuf; unsigned char *command = us->iobuf;
int result; int result;
US_DEBUGP("sddr09_erase: erase address %lu\n", Eaddress);
memset(command, 0, 12); memset(command, 0, 12);
command[0] = 0xEA; command[0] = 0xEA;
command[1] = LUNBITS; command[1] = LUNBITS;
...@@ -757,17 +758,27 @@ sddr09_read_data(struct us_data *us, ...@@ -757,17 +758,27 @@ sddr09_read_data(struct us_data *us,
return result; return result;
} }
/* we never free blocks, so lastpba can only increase */
static unsigned int static unsigned int
sddr09_find_unused_pba(struct sddr09_card_info *info) { sddr09_find_unused_pba(struct sddr09_card_info *info, unsigned int lba) {
static unsigned int lastpba = 1; static unsigned int lastpba = 1;
int numblocks = info->capacity >> (info->blockshift + info->pageshift); int zonestart, end, i;
int i;
zonestart = (lba/1000) << 10;
end = info->capacity >> (info->blockshift + info->pageshift);
end -= zonestart;
if (end > 1024)
end = 1024;
for (i = lastpba+1; i < numblocks; i++) { for (i = lastpba+1; i < end; i++) {
if (info->pba_to_lba[i] == UNDEF) { if (info->pba_to_lba[zonestart+i] == UNDEF) {
lastpba = i; lastpba = i;
return i; return zonestart+i;
}
}
for (i = 0; i <= lastpba; i++) {
if (info->pba_to_lba[zonestart+i] == UNDEF) {
lastpba = i;
return zonestart+i;
} }
} }
return 0; return 0;
...@@ -784,21 +795,23 @@ sddr09_write_lba(struct us_data *us, unsigned int lba, ...@@ -784,21 +795,23 @@ sddr09_write_lba(struct us_data *us, unsigned int lba,
unsigned int pagelen, blocklen; unsigned int pagelen, blocklen;
unsigned char *blockbuffer, *bptr, *cptr, *xptr; unsigned char *blockbuffer, *bptr, *cptr, *xptr;
unsigned char ecc[3]; unsigned char ecc[3];
int i, result; int i, result, isnew;
lbap = ((lba & 0x3ff) << 1) | 0x1000; lbap = ((lba % 1000) << 1) | 0x1000;
if (parity[MSB_of(lbap) ^ LSB_of(lbap)]) if (parity[MSB_of(lbap) ^ LSB_of(lbap)])
lbap ^= 1; lbap ^= 1;
pba = info->lba_to_pba[lba]; pba = info->lba_to_pba[lba];
isnew = 0;
if (pba == UNDEF) { if (pba == UNDEF) {
pba = sddr09_find_unused_pba(info); pba = sddr09_find_unused_pba(info, lba);
if (!pba) { if (!pba) {
printk("sddr09_write_lba: Out of unused blocks\n"); printk("sddr09_write_lba: Out of unused blocks\n");
return USB_STOR_TRANSPORT_ERROR; return USB_STOR_TRANSPORT_ERROR;
} }
info->pba_to_lba[pba] = lba; info->pba_to_lba[pba] = lba;
info->lba_to_pba[lba] = pba; info->lba_to_pba[lba] = pba;
isnew = 1;
} }
if (pba == 1) { if (pba == 1) {
...@@ -823,8 +836,8 @@ sddr09_write_lba(struct us_data *us, unsigned int lba, ...@@ -823,8 +836,8 @@ sddr09_write_lba(struct us_data *us, unsigned int lba,
if (result != USB_STOR_TRANSPORT_GOOD) if (result != USB_STOR_TRANSPORT_GOOD)
goto err; goto err;
/* check old contents */ /* check old contents and fill lba */
for (i = 0; i < info->blockshift; i++) { for (i = 0; i < info->blocksize; i++) {
bptr = blockbuffer + i*pagelen; bptr = blockbuffer + i*pagelen;
cptr = bptr + info->pagesize; cptr = bptr + info->pagesize;
nand_compute_ecc(bptr, ecc); nand_compute_ecc(bptr, ecc);
...@@ -839,6 +852,8 @@ sddr09_write_lba(struct us_data *us, unsigned int lba, ...@@ -839,6 +852,8 @@ sddr09_write_lba(struct us_data *us, unsigned int lba,
i, pba); i, pba);
nand_store_ecc(cptr+8, ecc); nand_store_ecc(cptr+8, ecc);
} }
cptr[6] = cptr[11] = MSB_of(lbap);
cptr[7] = cptr[12] = LSB_of(lbap);
} }
/* copy in new stuff and compute ECC */ /* copy in new stuff and compute ECC */
...@@ -852,8 +867,6 @@ sddr09_write_lba(struct us_data *us, unsigned int lba, ...@@ -852,8 +867,6 @@ sddr09_write_lba(struct us_data *us, unsigned int lba,
nand_store_ecc(cptr+13, ecc); nand_store_ecc(cptr+13, ecc);
nand_compute_ecc(bptr+(info->pagesize / 2), ecc); nand_compute_ecc(bptr+(info->pagesize / 2), ecc);
nand_store_ecc(cptr+8, ecc); nand_store_ecc(cptr+8, ecc);
cptr[6] = cptr[11] = MSB_of(lbap);
cptr[7] = cptr[12] = LSB_of(lbap);
} }
US_DEBUGP("Rewrite PBA %d (LBA %d)\n", pba, lba); US_DEBUGP("Rewrite PBA %d (LBA %d)\n", pba, lba);
...@@ -947,10 +960,11 @@ sddr09_read_control(struct us_data *us, ...@@ -947,10 +960,11 @@ sddr09_read_control(struct us_data *us,
unsigned char *content, unsigned char *content,
int use_sg) { int use_sg) {
US_DEBUGP("Read control address %08lX blocks %04X\n", US_DEBUGP("Read control address %lu, blocks %d\n",
address, blocks); address, blocks);
return sddr09_read21(us, address, blocks, CONTROL_SHIFT, content, use_sg); return sddr09_read21(us, address, blocks,
CONTROL_SHIFT, content, use_sg);
} }
/* /*
...@@ -997,7 +1011,7 @@ sddr09_get_wp(struct us_data *us, struct sddr09_card_info *info) { ...@@ -997,7 +1011,7 @@ sddr09_get_wp(struct us_data *us, struct sddr09_card_info *info) {
US_DEBUGP("sddr09_get_wp: read_status fails\n"); US_DEBUGP("sddr09_get_wp: read_status fails\n");
return result; return result;
} }
US_DEBUGP("sddr09_get_wp: status %02X", status); US_DEBUGP("sddr09_get_wp: status 0x%02X", status);
if ((status & 0x80) == 0) { if ((status & 0x80) == 0) {
info->flags |= SDDR09_WP; /* write protected */ info->flags |= SDDR09_WP; /* write protected */
US_DEBUGP(" WP"); US_DEBUGP(" WP");
...@@ -1114,8 +1128,11 @@ sddr09_read_map(struct us_data *us) { ...@@ -1114,8 +1128,11 @@ sddr09_read_map(struct us_data *us) {
alloc_blocks = min(numblocks, SDDR09_READ_MAP_BUFSZ >> CONTROL_SHIFT); alloc_blocks = min(numblocks, SDDR09_READ_MAP_BUFSZ >> CONTROL_SHIFT);
alloc_len = (alloc_blocks << CONTROL_SHIFT); alloc_len = (alloc_blocks << CONTROL_SHIFT);
buffer = kmalloc(alloc_len, GFP_NOIO); buffer = kmalloc(alloc_len, GFP_NOIO);
if (buffer == NULL) if (buffer == NULL) {
return 0; printk("sddr09_read_map: out of memory\n");
result = -1;
goto done;
}
buffer_end = buffer + alloc_len; buffer_end = buffer + alloc_len;
#undef SDDR09_READ_MAP_BUFSZ #undef SDDR09_READ_MAP_BUFSZ
...@@ -1141,15 +1158,18 @@ sddr09_read_map(struct us_data *us) { ...@@ -1141,15 +1158,18 @@ sddr09_read_map(struct us_data *us) {
for (i = 0; i < numblocks; i++) { for (i = 0; i < numblocks; i++) {
ptr += (1 << CONTROL_SHIFT); ptr += (1 << CONTROL_SHIFT);
if (ptr >= buffer_end) { if (ptr >= buffer_end) {
ptr = buffer; unsigned long address;
address = i << (info->pageshift + info->blockshift);
result = sddr09_read_control( result = sddr09_read_control(
us, i << (info->blockshift + 8), us, address>>1,
min(alloc_blocks, numblocks - i), min(alloc_blocks, numblocks - i),
buffer, 0); buffer, 0);
if (result != USB_STOR_TRANSPORT_GOOD) { if (result != USB_STOR_TRANSPORT_GOOD) {
result = -1; result = -1;
goto done; goto done;
} }
ptr = buffer;
} }
if (i == 0 || i == 1) { if (i == 0 || i == 1) {
...@@ -1162,7 +1182,7 @@ sddr09_read_map(struct us_data *us) { ...@@ -1162,7 +1182,7 @@ sddr09_read_map(struct us_data *us) {
if (ptr[j] != 0) if (ptr[j] != 0)
goto nonz; goto nonz;
info->pba_to_lba[i] = UNUSABLE; info->pba_to_lba[i] = UNUSABLE;
printk("sddr09: PBA %04X has no logical mapping\n", i); printk("sddr09: PBA %d has no logical mapping\n", i);
continue; continue;
nonz: nonz:
...@@ -1175,7 +1195,7 @@ sddr09_read_map(struct us_data *us) { ...@@ -1175,7 +1195,7 @@ sddr09_read_map(struct us_data *us) {
nonff: nonff:
/* normal PBAs start with six FFs */ /* normal PBAs start with six FFs */
if (j < 6) { if (j < 6) {
printk("sddr09: PBA %04X has no logical mapping: " printk("sddr09: PBA %d has no logical mapping: "
"reserved area = %02X%02X%02X%02X " "reserved area = %02X%02X%02X%02X "
"data status %02X block status %02X\n", "data status %02X block status %02X\n",
i, ptr[0], ptr[1], ptr[2], ptr[3], i, ptr[0], ptr[1], ptr[2], ptr[3],
...@@ -1185,7 +1205,7 @@ sddr09_read_map(struct us_data *us) { ...@@ -1185,7 +1205,7 @@ sddr09_read_map(struct us_data *us) {
} }
if ((ptr[6] >> 4) != 0x01) { if ((ptr[6] >> 4) != 0x01) {
printk("sddr09: PBA %04X has invalid address field " printk("sddr09: PBA %d has invalid address field "
"%02X%02X/%02X%02X\n", "%02X%02X/%02X%02X\n",
i, ptr[6], ptr[7], ptr[11], ptr[12]); i, ptr[6], ptr[7], ptr[11], ptr[12]);
info->pba_to_lba[i] = UNUSABLE; info->pba_to_lba[i] = UNUSABLE;
...@@ -1194,7 +1214,7 @@ sddr09_read_map(struct us_data *us) { ...@@ -1194,7 +1214,7 @@ sddr09_read_map(struct us_data *us) {
/* check even parity */ /* check even parity */
if (parity[ptr[6] ^ ptr[7]]) { if (parity[ptr[6] ^ ptr[7]]) {
printk("sddr09: Bad parity in LBA for block %04X" printk("sddr09: Bad parity in LBA for block %d"
" (%02X %02X)\n", i, ptr[6], ptr[7]); " (%02X %02X)\n", i, ptr[6], ptr[7]);
info->pba_to_lba[i] = UNUSABLE; info->pba_to_lba[i] = UNUSABLE;
continue; continue;
...@@ -1213,27 +1233,32 @@ sddr09_read_map(struct us_data *us) { ...@@ -1213,27 +1233,32 @@ sddr09_read_map(struct us_data *us) {
*/ */
if (lba >= 1000) { if (lba >= 1000) {
unsigned long address; printk("sddr09: Bad low LBA %d for block %d\n",
printk("sddr09: Bad LBA %04X for block %04X\n",
lba, i); lba, i);
info->pba_to_lba[i] = UNDEF /* UNUSABLE */; goto possibly_erase;
if (erase_bad_lba_entries) {
/* some cameras cannot erase a card if it has
bad entries, so we supply this function */
address = (i << (info->pageshift + info->blockshift));
sddr09_erase(us, address>>1);
}
continue;
} }
lba += 1000*(i/0x400); lba += 1000*(i/0x400);
if (lba<0x10 || (lba >= 0x3E0 && lba < 0x3EF)) if (info->lba_to_pba[lba] != UNDEF) {
US_DEBUGP("LBA %04X <-> PBA %04X\n", lba, i); printk("sddr09: LBA %d seen for PBA %d and %d\n",
lba, info->lba_to_pba[lba], i);
goto possibly_erase;
}
info->pba_to_lba[i] = lba; info->pba_to_lba[i] = lba;
info->lba_to_pba[lba] = i; info->lba_to_pba[lba] = i;
continue;
possibly_erase:
if (erase_bad_lba_entries) {
unsigned long address;
address = (i << (info->pageshift + info->blockshift));
sddr09_erase(us, address>>1);
info->pba_to_lba[i] = UNDEF;
} else
info->pba_to_lba[i] = UNUSABLE;
} }
/* /*
...@@ -1410,6 +1435,7 @@ int sddr09_transport(Scsi_Cmnd *srb, struct us_data *us) ...@@ -1410,6 +1435,7 @@ int sddr09_transport(Scsi_Cmnd *srb, struct us_data *us)
cardinfo = sddr09_get_cardinfo(us, info->flags); cardinfo = sddr09_get_cardinfo(us, info->flags);
if (!cardinfo) { if (!cardinfo) {
/* probably no media */ /* probably no media */
init_error:
sensekey = 0x02; /* not ready */ sensekey = 0x02; /* not ready */
sensecode = 0x3a; /* medium not present */ sensecode = 0x3a; /* medium not present */
return USB_STOR_TRANSPORT_FAILED; return USB_STOR_TRANSPORT_FAILED;
...@@ -1423,7 +1449,10 @@ int sddr09_transport(Scsi_Cmnd *srb, struct us_data *us) ...@@ -1423,7 +1449,10 @@ int sddr09_transport(Scsi_Cmnd *srb, struct us_data *us)
info->blockmask = info->blocksize - 1; info->blockmask = info->blocksize - 1;
// map initialization, must follow get_cardinfo() // map initialization, must follow get_cardinfo()
sddr09_read_map(us); if (sddr09_read_map(us)) {
/* probably out of memory */
goto init_error;
}
// Report capacity // Report capacity
...@@ -1444,12 +1473,13 @@ int sddr09_transport(Scsi_Cmnd *srb, struct us_data *us) ...@@ -1444,12 +1473,13 @@ int sddr09_transport(Scsi_Cmnd *srb, struct us_data *us)
return USB_STOR_TRANSPORT_GOOD; return USB_STOR_TRANSPORT_GOOD;
} }
if (srb->cmnd[0] == MODE_SENSE) { if (srb->cmnd[0] == MODE_SENSE || srb->cmnd[0] == MODE_SENSE_10) {
int modepage = (srb->cmnd[2] & 0x3F); int modepage = (srb->cmnd[2] & 0x3F);
int len; int len;
/* They ask for the Read/Write error recovery page, /* They ask for the Read/Write error recovery page,
or for all pages. Give as much as they have room for. */ or for all pages. Give as much as they have room for. */
/* %% We should check DBD %% */
if (modepage == 0x01 || modepage == 0x3F) { if (modepage == 0x01 || modepage == 0x3F) {
US_DEBUGP("SDDR09: Dummy up request for " US_DEBUGP("SDDR09: Dummy up request for "
...@@ -1473,17 +1503,9 @@ int sddr09_transport(Scsi_Cmnd *srb, struct us_data *us) ...@@ -1473,17 +1503,9 @@ int sddr09_transport(Scsi_Cmnd *srb, struct us_data *us)
return USB_STOR_TRANSPORT_FAILED; return USB_STOR_TRANSPORT_FAILED;
} }
if (srb->cmnd[0] == ALLOW_MEDIUM_REMOVAL) { if (srb->cmnd[0] == ALLOW_MEDIUM_REMOVAL)
US_DEBUGP(
"SDDR09: %s medium removal. Not that I can do"
" anything about it...\n",
(srb->cmnd[4]&0x03) ? "Prevent" : "Allow");
return USB_STOR_TRANSPORT_GOOD; return USB_STOR_TRANSPORT_GOOD;
}
havefakesense = 0; havefakesense = 0;
if (srb->cmnd[0] == READ_10) { if (srb->cmnd[0] == READ_10) {
...@@ -1531,8 +1553,7 @@ int sddr09_transport(Scsi_Cmnd *srb, struct us_data *us) ...@@ -1531,8 +1553,7 @@ int sddr09_transport(Scsi_Cmnd *srb, struct us_data *us)
for (i=0; i<12; i++) for (i=0; i<12; i++)
sprintf(string+strlen(string), "%02X ", srb->cmnd[i]); sprintf(string+strlen(string), "%02X ", srb->cmnd[i]);
US_DEBUGP("SDDR09: Send control for command %s\n", US_DEBUGP("SDDR09: Send control for command %s\n", string);
string);
result = sddr09_send_scsi_command(us, srb->cmnd, 12); result = sddr09_send_scsi_command(us, srb->cmnd, 12);
if (result != USB_STOR_TRANSPORT_GOOD) { if (result != USB_STOR_TRANSPORT_GOOD) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7