| Message ID | 20100303171749.GJ12362@oksana.dev.rtsoft.ru |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
Hello. Anton Vorontsov wrote: > This is needed for non-PCI drivers that will be added soon. > > Since the symbols are exported now, libahci and ahci can be built as > a separate modules. > > Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> > --- > drivers/ata/Kconfig | 8 +++++++- > drivers/ata/Makefile | 3 ++- > drivers/ata/libahci.c | 20 ++++++++++++++++++++ > 3 files changed, 29 insertions(+), 2 deletions(-) > > diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig > index 01c52c4..365a9da 100644 > --- a/drivers/ata/Kconfig > +++ b/drivers/ata/Kconfig > @@ -59,12 +59,18 @@ config SATA_PMP > > config SATA_AHCI > tristate "AHCI SATA support" > - depends on PCI > help > This option enables support for AHCI Serial ATA. > > If unsure, say N. > > +config SATA_AHCI_PCI > + tristate "PCI AHCI SATA support" > + depends on SATA_AHCI && PCI > Perhaps it's worth to turn that into select SATA_AHCI and make SATA_AHCI invisible to users instead, so that each particular AHCI implementation could select it. > + default y > Why force the default "y" if the predecessor option SATA_AHCI didn't do it? MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Mar 03, 2010 at 08:53:30PM +0300, Sergei Shtylyov wrote: [...] > >diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig > >index 01c52c4..365a9da 100644 > >--- a/drivers/ata/Kconfig > >+++ b/drivers/ata/Kconfig > >@@ -59,12 +59,18 @@ config SATA_PMP > > config SATA_AHCI > > tristate "AHCI SATA support" > >- depends on PCI > > help > > This option enables support for AHCI Serial ATA. > > If unsure, say N. > >+config SATA_AHCI_PCI > >+ tristate "PCI AHCI SATA support" > >+ depends on SATA_AHCI && PCI > > Perhaps it's worth to turn that into select SATA_AHCI and make > SATA_AHCI invisible to users instead, so that each particular AHCI > implementation could select it. No, we must maintain old .config's semantics. SATA_AHCI is already visible to the users, and if we remove it, we'll break 'make oldconfig'. > >+ default y > > Why force the default "y" if the predecessor option SATA_AHCI > didn't do it? For the same reason, to keep old .configs working. Thanks,
On Wed, Mar 03, 2010 at 09:08:34PM +0300, Anton Vorontsov wrote: > On Wed, Mar 03, 2010 at 08:53:30PM +0300, Sergei Shtylyov wrote: > [...] > > >diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig > > >index 01c52c4..365a9da 100644 > > >--- a/drivers/ata/Kconfig > > >+++ b/drivers/ata/Kconfig > > >@@ -59,12 +59,18 @@ config SATA_PMP > > > config SATA_AHCI > > > tristate "AHCI SATA support" > > >- depends on PCI > > > help > > > This option enables support for AHCI Serial ATA. > > > If unsure, say N. > > >+config SATA_AHCI_PCI > > >+ tristate "PCI AHCI SATA support" > > >+ depends on SATA_AHCI && PCI > > > > Perhaps it's worth to turn that into select SATA_AHCI and make > > SATA_AHCI invisible to users instead, so that each particular AHCI > > implementation could select it. > > No, we must maintain old .config's semantics. SATA_AHCI is already > visible to the users, and if we remove it, we'll break > 'make oldconfig'. > > > >+ default y > > > > Why force the default "y" if the predecessor option SATA_AHCI > > didn't do it? > > For the same reason, to keep old .configs working. OTOH, we can introduce invisible SATA_LIBAHCI, which is better, I think. -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 03/03/2010 01:14 PM, Anton Vorontsov wrote: > On Wed, Mar 03, 2010 at 09:08:34PM +0300, Anton Vorontsov wrote: >> On Wed, Mar 03, 2010 at 08:53:30PM +0300, Sergei Shtylyov wrote: >> [...] >>>> diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig >>>> index 01c52c4..365a9da 100644 >>>> --- a/drivers/ata/Kconfig >>>> +++ b/drivers/ata/Kconfig >>>> @@ -59,12 +59,18 @@ config SATA_PMP >>>> config SATA_AHCI >>>> tristate "AHCI SATA support" >>>> - depends on PCI >>>> help >>>> This option enables support for AHCI Serial ATA. >>>> If unsure, say N. >>>> +config SATA_AHCI_PCI >>>> + tristate "PCI AHCI SATA support" >>>> + depends on SATA_AHCI&& PCI >>> >>> Perhaps it's worth to turn that into select SATA_AHCI and make >>> SATA_AHCI invisible to users instead, so that each particular AHCI >>> implementation could select it. >> >> No, we must maintain old .config's semantics. SATA_AHCI is already >> visible to the users, and if we remove it, we'll break >> 'make oldconfig'. >> >>>> + default y >>> >>> Why force the default "y" if the predecessor option SATA_AHCI >>> didn't do it? >> >> For the same reason, to keep old .configs working. > > OTOH, we can introduce invisible SATA_LIBAHCI, which is better, > I think. There is no need for any Kconfig wrangling. Just do it in the Makefile: obj-$(SATA_AHCI_EXAMPLE1) += sata_example1.o libahci.o obj-$(SATA_AHCI_EXAMPLE2) += sata_example2.o libahci.o Thus, 1) update PCI ahci's Makefile entry 2) add Kconfig and Makefile entry for platform_ahci No need to touch PCI AHCI's Kconfig bits at all. Regards, Jeff -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Mar 03, 2010 at 01:34:01PM -0500, Jeff Garzik wrote: [...] > >OTOH, we can introduce invisible SATA_LIBAHCI, which is better, > >I think. > > There is no need for any Kconfig wrangling. Just do it in the Makefile: > > obj-$(SATA_AHCI_EXAMPLE1) += sata_example1.o libahci.o > obj-$(SATA_AHCI_EXAMPLE2) += sata_example2.o libahci.o > > Thus, > > 1) update PCI ahci's Makefile entry > 2) add Kconfig and Makefile entry for platform_ahci > > No need to touch PCI AHCI's Kconfig bits at all. Ah, I see. Will do. Thanks!
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 01c52c4..365a9da 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -59,12 +59,18 @@ config SATA_PMP config SATA_AHCI tristate "AHCI SATA support" - depends on PCI help This option enables support for AHCI Serial ATA. If unsure, say N. +config SATA_AHCI_PCI + tristate "PCI AHCI SATA support" + depends on SATA_AHCI && PCI + default y + help + This option enables support for PCI AHCI Serial ATA controllers. + config SATA_SIL24 tristate "Silicon Image 3124/3132 SATA support" depends on PCI diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index 75e3abd..a438cef 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -1,7 +1,8 @@ obj-$(CONFIG_ATA) += libata.o -obj-$(CONFIG_SATA_AHCI) += libahci.o ahci.o +obj-$(CONFIG_SATA_AHCI) += libahci.o +obj-$(CONFIG_SATA_AHCI_PCI) += ahci.o obj-$(CONFIG_SATA_SVW) += sata_svw.o obj-$(CONFIG_ATA_PIIX) += ata_piix.o obj-$(CONFIG_SATA_PROMISE) += sata_promise.o diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 3ec32ee..d2eacc4 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -47,6 +47,7 @@ static int ahci_skip_host_reset; int ahci_ignore_sss; +EXPORT_SYMBOL_GPL(ahci_ignore_sss); module_param_named(skip_host_reset, ahci_skip_host_reset, int, 0444); MODULE_PARM_DESC(skip_host_reset, "skip global host reset (0=don't skip, 1=skip)"); @@ -137,6 +138,7 @@ struct scsi_host_template ahci_sht = { .shost_attrs = ahci_shost_attrs, .sdev_attrs = ahci_sdev_attrs, }; +EXPORT_SYMBOL_GPL(ahci_sht); struct ata_port_operations ahci_ops = { .inherits = &sata_pmp_port_ops, @@ -174,8 +176,10 @@ struct ata_port_operations ahci_ops = { .port_start = ahci_port_start, .port_stop = ahci_port_stop, }; +EXPORT_SYMBOL_GPL(ahci_ops); int ahci_em_messages = 1; +EXPORT_SYMBOL_GPL(ahci_em_messages); module_param(ahci_em_messages, int, 0444); /* add other LED protocol types when they become supported */ MODULE_PARM_DESC(ahci_em_messages, @@ -369,6 +373,7 @@ void ahci_save_initial_config(struct device *dev, hpriv->cap2 = cap2; hpriv->port_map = port_map; } +EXPORT_SYMBOL_GPL(ahci_save_initial_config); /** * ahci_restore_initial_config - Restore initial config @@ -443,6 +448,7 @@ void ahci_start_engine(struct ata_port *ap) writel(tmp, port_mmio + PORT_CMD); readl(port_mmio + PORT_CMD); /* flush */ } +EXPORT_SYMBOL_GPL(ahci_start_engine); int ahci_stop_engine(struct ata_port *ap) { @@ -467,6 +473,7 @@ int ahci_stop_engine(struct ata_port *ap) return 0; } +EXPORT_SYMBOL_GPL(ahci_stop_engine); static void ahci_start_fis_rx(struct ata_port *ap) { @@ -784,6 +791,7 @@ int ahci_reset_controller(struct ata_host *host) return 0; } +EXPORT_SYMBOL_GPL(ahci_reset_controller); static void ahci_sw_activity(struct ata_link *link) { @@ -871,6 +879,7 @@ int ahci_reset_em(struct ata_host *host) writel(em_ctl | EM_CTL_RST, mmio + HOST_EM_CTL); return 0; } +EXPORT_SYMBOL_GPL(ahci_reset_em); static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state, ssize_t size) @@ -1064,6 +1073,7 @@ void ahci_init_controller(struct ata_host *host) tmp = readl(mmio + HOST_CTL); VPRINTK("HOST_CTL 0x%x\n", tmp); } +EXPORT_SYMBOL_GPL(ahci_init_controller); static void ahci_dev_config(struct ata_device *dev) { @@ -1147,6 +1157,7 @@ int ahci_kick_engine(struct ata_port *ap) ahci_start_engine(ap); return rc; } +EXPORT_SYMBOL_GPL(ahci_kick_engine); static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp, struct ata_taskfile *tf, int is_cmd, u16 flags, @@ -1253,6 +1264,7 @@ int ahci_check_ready(struct ata_link *link) return ata_check_ready(status); } +EXPORT_SYMBOL_GPL(ahci_check_ready); static int ahci_softreset(struct ata_link *link, unsigned int *class, unsigned long deadline) @@ -1263,6 +1275,7 @@ static int ahci_softreset(struct ata_link *link, unsigned int *class, return ahci_do_softreset(link, class, pmp, deadline, ahci_check_ready); } +EXPORT_SYMBOL_GPL(ahci_do_softreset); static int ahci_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline) @@ -1665,6 +1678,7 @@ irqreturn_t ahci_interrupt(int irq, void *dev_instance) return IRQ_RETVAL(handled); } +EXPORT_SYMBOL_GPL(ahci_interrupt); static unsigned int ahci_qc_issue(struct ata_queued_cmd *qc) { @@ -2034,6 +2048,7 @@ void ahci_print_info(struct ata_host *host, const char *scc_s) cap2 & HOST_CAP2_BOH ? "boh " : "" ); } +EXPORT_SYMBOL_GPL(ahci_print_info); void ahci_set_em_messages(struct ahci_host_priv *hpriv, struct ata_port_info *pi) @@ -2057,3 +2072,8 @@ void ahci_set_em_messages(struct ahci_host_priv *hpriv, pi->flags |= ATA_FLAG_SW_ACTIVITY; } } +EXPORT_SYMBOL_GPL(ahci_set_em_messages); + +MODULE_AUTHOR("Jeff Garzik"); +MODULE_DESCRIPTION("AHCI SATA low-level routines"); +MODULE_LICENSE("GPL");
This is needed for non-PCI drivers that will be added soon. Since the symbols are exported now, libahci and ahci can be built as a separate modules. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> --- drivers/ata/Kconfig | 8 +++++++- drivers/ata/Makefile | 3 ++- drivers/ata/libahci.c | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-)