From: Anton Blanchard <anton@samba.org>
To: linux-scsi@vger.kernel.org
Cc: groudier@free.fr
Subject: Re: Make sym2 driver use pci_enable_device
Date: Wed, 16 Apr 2003 01:41:59 +1000 [thread overview]
Message-ID: <20030415154159.GG2067@krispykreme> (raw)
In-Reply-To: <20030414233239.GD2067@krispykreme>
> The sym2 driver should use the generic pci_enable_device() and
> pci_set_master() functions.
Sorry, wrong patch. We need to read COMMAND after doing
pci_enable_device/pci_set_master. We should also check the return
valie of pci_enable_device.
Anton
===== drivers/scsi/sym53c8xx_2/sym_glue.c 1.16 vs edited =====
--- 1.16/drivers/scsi/sym53c8xx_2/sym_glue.c Thu Feb 20 23:16:32 2003
+++ edited/drivers/scsi/sym53c8xx_2/sym_glue.c Tue Apr 15 08:51:04 2003
@@ -2556,35 +2556,17 @@
bcopy(chip, &device->chip, sizeof(device->chip));
device->chip.revision_id = revision;
+ if (pci_enable_device(pdev))
+ return -1;
+
+ pci_set_master(pdev);
+
/*
* Read additionnal info from the configuration space.
*/
- pci_read_config_word(pdev, PCI_COMMAND, &command);
pci_read_config_byte(pdev, PCI_CACHE_LINE_SIZE, &cache_line_size);
/*
- * Enable missing capabilities in the PCI COMMAND register.
- */
-#ifdef SYM_CONF_IOMAPPED
-#define PCI_COMMAND_BITS_TO_ENABLE (PCI_COMMAND_IO | \
- PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_PARITY)
-#else
-#define PCI_COMMAND_BITS_TO_ENABLE \
- (PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | PCI_COMMAND_PARITY)
-#endif
- if ((command & PCI_COMMAND_BITS_TO_ENABLE)
- != PCI_COMMAND_BITS_TO_ENABLE) {
- printf_info("%s: setting%s%s%s%s...\n", sym_name(device),
- (command & PCI_COMMAND_IO) ? "" : " PCI_COMMAND_IO",
- (command & PCI_COMMAND_MEMORY) ? "" : " PCI_COMMAND_MEMORY",
- (command & PCI_COMMAND_MASTER) ? "" : " PCI_COMMAND_MASTER",
- (command & PCI_COMMAND_PARITY) ? "" : " PCI_COMMAND_PARITY");
- command |= PCI_COMMAND_BITS_TO_ENABLE;
- pci_write_config_word(pdev, PCI_COMMAND, command);
- }
-#undef PCI_COMMAND_BITS_TO_ENABLE
-
- /*
* If cache line size is not configured, suggest
* a value for well known CPUs.
*/
@@ -2623,6 +2605,7 @@
sym_name(device), cache_line_size);
}
+ pci_read_config_word(pdev, PCI_COMMAND, &command);
if ((pci_fix_up & 2) && cache_line_size &&
(chip->features & FE_WRIE) && !(command & PCI_COMMAND_INVALIDATE)) {
printf_info("%s: setting PCI_COMMAND_INVALIDATE.\n",
prev parent reply other threads:[~2003-04-15 15:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-04-14 23:32 Make sym2 driver use pci_enable_device Anton Blanchard
2003-04-15 15:41 ` Anton Blanchard [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030415154159.GG2067@krispykreme \
--to=anton@samba.org \
--cc=groudier@free.fr \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox