* [PATCH v2 6/18] arcmsr: precise checking adapter ID
@ 2014-08-04 8:55 Ching Huang
2014-08-11 13:13 ` Christoph Hellwig
0 siblings, 1 reply; 2+ messages in thread
From: Ching Huang @ 2014-08-04 8:55 UTC (permalink / raw)
To: hch, jbottomley, dan.carpenter, thenzl, agordeev, linux-scsi,
linux-kernel
From: Ching Huang <ching2048@areca.com.tw>
This patch rewrites the arcmsr_define_adapter_type function to precisely check Areca adapter's ID.
This can prevent an unknown adapter being used as a default adapter type by driver.
Signed-off-by: Ching Huang <ching2048@areca.com.tw>
---
Thanks for Christoph advice.
diff -uprN a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
--- a/drivers/scsi/arcmsr/arcmsr_hba.c 2014-08-01 18:02:08.000000000 +0800
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c 2014-08-04 16:43:16.000000000 +0800
@@ -295,24 +295,43 @@ static int arcmsr_bios_param(struct scsi
return 0;
}
-static void arcmsr_define_adapter_type(struct AdapterControlBlock *acb)
+static int arcmsr_define_adapter_type(struct AdapterControlBlock *acb)
{
struct pci_dev *pdev = acb->pdev;
u16 dev_id;
- pci_read_config_word(pdev, PCI_DEVICE_ID, &dev_id);
+
+ dev_id = pdev->device;
acb->dev_id = dev_id;
switch (dev_id) {
- case 0x1880: {
+ case 0x1880:
acb->adapter_type = ACB_ADAPTER_TYPE_C;
- }
break;
- case 0x1201: {
+ case 0x1200:
+ case 0x1201:
+ case 0x1202:
acb->adapter_type = ACB_ADAPTER_TYPE_B;
- }
break;
-
- default: acb->adapter_type = ACB_ADAPTER_TYPE_A;
+ case 0x1110:
+ case 0x1120:
+ case 0x1130:
+ case 0x1160:
+ case 0x1170:
+ case 0x1210:
+ case 0x1220:
+ case 0x1230:
+ case 0x1260:
+ case 0x1270:
+ case 0x1280:
+ case 0x1380:
+ case 0x1381:
+ case 0x1680:
+ acb->adapter_type = ACB_ADAPTER_TYPE_A;
+ break;
+ default:
+ pr_notice("Unknown device ID = 0x%x\n", dev_id);
+ return false;
}
+ return true;
}
static uint8_t arcmsr_hba_wait_msgint_ready(struct AdapterControlBlock *acb)
@@ -710,7 +729,9 @@ static int arcmsr_probe(struct pci_dev *
ACB_F_MESSAGE_WQBUFFER_READED);
acb->acb_flags &= ~ACB_F_SCSISTOPADAPTER;
INIT_LIST_HEAD(&acb->ccb_free_list);
- arcmsr_define_adapter_type(acb);
+ error = arcmsr_define_adapter_type(acb);
+ if (!error)
+ goto pci_release_regs;
error = arcmsr_remap_pciregion(acb);
if(!error){
goto pci_release_regs;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2 6/18] arcmsr: precise checking adapter ID
2014-08-04 8:55 [PATCH v2 6/18] arcmsr: precise checking adapter ID Ching Huang
@ 2014-08-11 13:13 ` Christoph Hellwig
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Hellwig @ 2014-08-11 13:13 UTC (permalink / raw)
To: Ching Huang
Cc: hch, jbottomley, dan.carpenter, thenzl, agordeev, linux-scsi,
linux-kernel
On Mon, Aug 04, 2014 at 04:55:12PM +0800, Ching Huang wrote:
> From: Ching Huang <ching2048@areca.com.tw>
>
> This patch rewrites the arcmsr_define_adapter_type function to precisely check Areca adapter's ID.
> This can prevent an unknown adapter being used as a default adapter type by driver.
>
> Signed-off-by: Ching Huang <ching2048@areca.com.tw>
> ---
>
> Thanks for Christoph advice.
This still doesn't use the private_data field in the pci device table.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-11 13:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-04 8:55 [PATCH v2 6/18] arcmsr: precise checking adapter ID Ching Huang
2014-08-11 13:13 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).