tpm: remove pci dependency
Subsystems (2)
PATCH 1/1 tpm: remove pci dependency
Since the tpm does not have it's own pci id we have been consuming the lpc bus. This is not correct and causes problems to support non lpc bus chips. This patch removes the dependency on pci_dev from tpm.c The subsequent patches will stop the supported chips from registering as pci drivers.
Signed-off-by Kylene Hall <[email protected]>
---
drivers/char/tpm/tpm_atmel.c +17 -9
@@ -54,7 +54,7 @@ static int tpm_atml_recv(struct tpm_chipfor (i =0 ; i <6 ; i++) { status =inb (chip->vendor->base +1 );if ((status &ATML_STATUS_DATA_AVAIL ) ==0 ) { -dev_err (&chip->pci_dev->dev, +dev_err (chip->dev,"error reading header\n" );return -EIO ; }
@@ -66,12 +66,12 @@ static int tpm_atml_recv(struct tpm_chip size =be32_to_cpu (*native_size);if (count < size) { -dev_err (&chip->pci_dev->dev, +dev_err (chip->dev,"Recv size(%d) less than available space\n" , size);for (; i < size; i++) {/* clear the waiting data anyway */ status =inb (chip->vendor->base +1 );if ((status &ATML_STATUS_DATA_AVAIL ) ==0 ) { -dev_err (&chip->pci_dev->dev, +dev_err (chip->dev,"error reading data\n" );return -EIO ; }
@@ -83,7 +83,7 @@ static int tpm_atml_recv(struct tpm_chipfor (; i < size; i++) { status =inb (chip->vendor->base +1 );if ((status &ATML_STATUS_DATA_AVAIL ) ==0 ) { -dev_err (&chip->pci_dev->dev, +dev_err (chip->dev,"error reading data\n" );return -EIO ; }
@@ -93,7 +93,7 @@ static int tpm_atml_recv(struct tpm_chip/* make sure data available is gone */ status =inb (chip->vendor->base +1 );if (status &ATML_STATUS_DATA_AVAIL ) { -dev_err (&chip->pci_dev->dev,"data available is stuck\n" ); +dev_err (chip->dev,"data available is stuck\n" );return -EIO ; }
@@ -104,9 +104,9 @@ static int tpm_atml_send(struct tpm_chip {int i; -dev_dbg (&chip->pci_dev->dev,"tpm_atml_send: " ); +dev_dbg (chip->dev,"tpm_atml_send:\n" );for (i =0 ; i < count; i++) { -dev_dbg (&chip->pci_dev->dev,"0x%x(%d) " , buf[i], buf[i]); +dev_dbg (chip->dev,"%d 0x%x(%d)\n" , i, buf[i], buf[i]);outb (buf[i], chip->vendor->base); }
@@ -193,7 +193,7 @@ static int __devinit tpm_atml_init(struc goto out_err; } -if ((rc =tpm_register_hardware (pci_dev, &tpm_atmel)) <0 ) +if ((rc =tpm_register_hardware (&pci_dev->dev, &tpm_atmel)) <0 ) goto out_err; dev_info(&pci_dev->dev,
@@ -206,6 +206,14 @@ out_err:return rc; } +static void __devexit tpm_atml_remove(struct pci_dev *pci_dev) +{ +struct tpm_chip *chip =pci_get_drvdata (pci_dev); + +if ( chip ) +tpm_remove_hardware (chip->dev); +} +static struct pci_device_id tpm_pci_tbl[]__devinitdata = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801BA_0 )}, {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801CA_12 )},
@@ -223,7 +231,7 @@ static struct pci_driver atmel_pci_drive .name = "tpm_atmel", .id_table = tpm_pci_tbl, .probe = tpm_atml_init, - .remove = __devexit_p(tpm_remove), + .remove = __devexit_p(tpm_atml_remove), .suspend = tpm_pm_suspend, .resume = tpm_pm_resume, };
drivers/char/tpm/tpm.c +30 -35
214 lines not on this page · raw message
drivers/char/tpm/tpm.h +3 -3
@@ -61,7 +61,7 @@ struct tpm_vendor_specific { };struct tpm_chip { -struct pci_dev *pci_dev;/* PCI device stuff */ +struct device *dev;/* Device stuff */ int dev_num;/* /dev/tpm# */ int num_opens;/* only one allowed */
@@ -92,13 +92,13 @@ static inline void tpm_write_index(int boutb (value &0xFF , base+1 ); } -extern int tpm_register_hardware (struct pci_dev *, +extern int tpm_register_hardware (struct device *,struct tpm_vendor_specific *);extern int tpm_open (struct inode *,struct file *);extern int tpm_release (struct inode *,struct file *);extern ssize_t tpm_write (struct file *,const char __user *,size_t ,loff_t *);extern ssize_t tpm_read (struct file *,char __user *,size_t ,loff_t *); -extern void __devexit tpm_remove(struct pci_dev *); +extern void tpm_remove_hardware (struct device *);extern int tpm_pm_suspend (struct pci_dev *,pm_message_t );extern int tpm_pm_resume (struct pci_dev *);
drivers/char/tpm/tpm_infineon.c +21 -13
@@ -143,10 +143,10 @@ static int wait(struct tpm_chip *chip, i }if (i ==TPM_MAX_TRIES ) {/* timeout occurs */ if (wait_for_bit ==STAT_XFE ) -dev_err (&chip->pci_dev->dev, +dev_err (chip->dev,"Timeout in wait(STAT_XFE)\n" );if (wait_for_bit ==STAT_RDA ) -dev_err (&chip->pci_dev->dev, +dev_err (chip->dev,"Timeout in wait(STAT_RDA)\n" );return -EIO ; }
@@ -170,7 +170,7 @@ static void wait_and_send(struct tpm_chistatic void tpm_wtx (struct tpm_chip *chip) { number_of_wtx++; -dev_info (&chip->pci_dev->dev,"Granting WTX (%02d / %02d)\n" , +dev_info (chip->dev,"Granting WTX (%02d / %02d)\n" , number_of_wtx,TPM_MAX_WTX_PACKAGES );wait_and_send (chip,TPM_VL_VER );wait_and_send (chip,TPM_CTRL_WTX );
@@ -181,7 +181,7 @@ static void tpm_wtx(struct tpm_chip *chistatic void tpm_wtx_abort (struct tpm_chip *chip) { -dev_info (&chip->pci_dev->dev,"Aborting WTX\n" ); +dev_info (chip->dev,"Aborting WTX\n" );wait_and_send (chip,TPM_VL_VER );wait_and_send (chip,TPM_CTRL_WTX_ABORT );wait_and_send (chip,0x00 );
@@ -206,7 +206,7 @@ recv_begin: }if (buf[0 ] !=TPM_VL_VER ) { -dev_err (&chip->pci_dev->dev, +dev_err (chip->dev,"Wrong transport protocol implementation!\n" );return -EIO ; }
@@ -221,7 +221,7 @@ recv_begin: }if ((size ==0x6D00 ) && (buf[1 ] ==0x80 )) { -dev_err (&chip->pci_dev->dev, +dev_err (chip->dev,"Error handling on vendor layer!\n" );return -EIO ; }
@@ -234,7 +234,7 @@ recv_begin: }if (buf[1 ] ==TPM_CTRL_WTX ) { -dev_info (&chip->pci_dev->dev,"WTX-package received\n" ); +dev_info (chip->dev,"WTX-package received\n" );if (number_of_wtx <TPM_MAX_WTX_PACKAGES ) {tpm_wtx (chip); goto recv_begin;
@@ -245,14 +245,14 @@ recv_begin: }if (buf[1 ] ==TPM_CTRL_WTX_ABORT_ACK ) { -dev_info (&chip->pci_dev->dev,"WTX-abort acknowledged\n" ); +dev_info (chip->dev,"WTX-abort acknowledged\n" );return size; }if (buf[1 ] ==TPM_CTRL_ERROR ) { -dev_err (&chip->pci_dev->dev,"ERROR-package received:\n" ); +dev_err (chip->dev,"ERROR-package received:\n" );if (buf[4 ] ==TPM_INF_NAK ) -dev_err (&chip->pci_dev->dev, +dev_err (chip->dev,"-> Negative acknowledgement" " - retransmit command!\n" );return -EIO ;
@@ -271,7 +271,7 @@ static int tpm_inf_send(struct tpm_chip ret =empty_fifo (chip,1 );if (ret) { -dev_err (&chip->pci_dev->dev,"Timeout while clearing FIFO\n" ); +dev_err (chip->dev,"Timeout while clearing FIFO\n" );return -EIO ; }
@@ -484,6 +484,6 @@ static int __devinit tpm_inf_probe(struc vendorid[0 ], vendorid[1 ], productid[0], productid[1], chipname); - rc =tpm_register_hardware (pci_dev, &tpm_inf); + rc =tpm_register_hardware (&pci_dev->dev, &tpm_inf);if (rc <0 ) goto error;
@@ -497,6 +497,14 @@ static int __devinit tpm_inf_probe(struc } } +static __devexit void tpm_inf_remove(struct pci_dev* pci_dev) +{ +struct tpm_chip * chip =pci_get_drvdata (pci_dev); + +if ( chip ) +tpm_remove_hardware (chip->dev); +} +static struct pci_device_id tpm_pci_tbl[]__devinitdata = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801BA_0 )}, {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801CA_12 )},
@@ -515,7 +523,7 @@ static struct pci_driver inf_pci_driver .name = "tpm_inf", .id_table = tpm_pci_tbl, .probe = tpm_inf_probe, - .remove = __devexit_p(tpm_remove), + .remove = __devexit_p(tpm_inf_remove), .suspend = tpm_pm_suspend, .resume = tpm_pm_resume, };
drivers/char/tpm/tpm_nsc.c +20 -12
@@ -111,7 +111,7 @@ static int nsc_wait_for_ready(struct tpm }while (time_before (jiffies, stop)); -dev_info (&chip->pci_dev->dev,"wait for ready failed\n" ); +dev_info (chip->dev,"wait for ready failed\n" );return -EBUSY ; }
@@ -127,12 +127,12 @@ static int tpm_nsc_recv(struct tpm_chipreturn -EIO ;if (wait_for_stat (chip,NSC_STATUS_F0 ,NSC_STATUS_F0 , &data) <0 ) { -dev_err (&chip->pci_dev->dev,"F0 timeout\n" ); +dev_err (chip->dev,"F0 timeout\n" );return -EIO ; }if ((data =inb (chip->vendor->base +NSC_DATA )) !=NSC_COMMAND_NORMAL ) { -dev_err (&chip->pci_dev->dev,"not in normal mode (0x%x)\n" , +dev_err (chip->dev,"not in normal mode (0x%x)\n" , data);return -EIO ; }
@@ -141,7 +141,7 @@ static int tpm_nsc_recv(struct tpm_chipfor (p = buffer; p < &buffer[count]; p++) {if (wait_for_stat (chip,NSC_STATUS_OBF ,NSC_STATUS_OBF , &data) <0 ) { -dev_err (&chip->pci_dev->dev, +dev_err (chip->dev,"OBF timeout (while reading data)\n" );return -EIO ; }
@@ -152,11 +152,11 @@ static int tpm_nsc_recv(struct tpm_chipif ((data &NSC_STATUS_F0 ) ==0 && (wait_for_stat (chip,NSC_STATUS_F0 ,NSC_STATUS_F0 , &data) <0 )) { -dev_err (&chip->pci_dev->dev,"F0 not set\n" ); +dev_err (chip->dev,"F0 not set\n" );return -EIO ; }if ((data =inb (chip->vendor->base +NSC_DATA )) !=NSC_COMMAND_EOC ) { -dev_err (&chip->pci_dev->dev, +dev_err (chip->dev,"expected end of command(0x%x)\n" , data);return -EIO ; }
@@ -187,19 +187,19 @@ static int tpm_nsc_send(struct tpm_chipreturn -EIO ;if (wait_for_stat (chip,NSC_STATUS_IBF ,0 , &data) <0 ) { -dev_err (&chip->pci_dev->dev,"IBF timeout\n" ); +dev_err (chip->dev,"IBF timeout\n" );return -EIO ; }outb (NSC_COMMAND_NORMAL , chip->vendor->base +NSC_COMMAND );if (wait_for_stat (chip,NSC_STATUS_IBR ,NSC_STATUS_IBR , &data) <0 ) { -dev_err (&chip->pci_dev->dev,"IBR timeout\n" ); +dev_err (chip->dev,"IBR timeout\n" );return -EIO ; }for (i =0 ; i < count; i++) {if (wait_for_stat (chip,NSC_STATUS_IBF ,0 , &data) <0 ) { -dev_err (&chip->pci_dev->dev, +dev_err (chip->dev,"IBF timeout (while writing data)\n" );return -EIO ; }
@@ -207,7 +207,7 @@ static int tpm_nsc_send(struct tpm_chip }if (wait_for_stat (chip,NSC_STATUS_IBF ,0 , &data) <0 ) { -dev_err (&chip->pci_dev->dev,"IBF timeout\n" ); +dev_err (chip->dev,"IBF timeout\n" );return -EIO ; }outb (NSC_COMMAND_EOC , chip->vendor->base +NSC_COMMAND );
@@ -325,7 +325,7 @@ static int __devinit tpm_nsc_init(struct/* enable the DPM module */ tpm_write_index (nscAddrBase,NSC_LDC_INDEX ,0x01 ); -if ((rc =tpm_register_hardware (pci_dev, &tpm_nsc)) <0 ) +if ((rc =tpm_register_hardware (&pci_dev->dev, &tpm_nsc)) <0 ) goto out_err;return 0 ;
@@ -335,6 +335,14 @@ out_err:return rc; } +static void __devexit tpm_nsc_remove(struct pci_dev *pci_dev) +{ +struct tpm_chip *chip =pci_get_drvdata (pci_dev); + +if ( chip ) +tpm_remove_hardware (chip->dev); +} +static struct pci_device_id tpm_pci_tbl[]__devinitdata = { {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801BA_0 )}, {PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82801CA_12 )},
@@ -354,7 +362,7 @@ static struct pci_driver nsc_pci_driver .name = "tpm_nsc", .id_table = tpm_pci_tbl, .probe = tpm_nsc_init, - .remove = __devexit_p(tpm_remove), + .remove = __devexit_p(tpm_nsc_remove), .suspend = tpm_pm_suspend, .resume = tpm_pm_resume, };