gmane.linux.ide

Re: [PATCH] ata: use platform_{get,set}_drvdata()

'Tejun Heo' — 2013-05-24T01:26:40

Applied to libata/for-3.11.  Thanks.

I am Mr Chan Yuan..

Chan Yuan — 2013-05-23T00:23:58

I am Mr Chan Yuan,we are looking for a representative in your country to assist us pick up funds from our clients in your location. If you are interested do get back to me for futher details with your name/address/tel.There is no financial obligation on your part. Do also note that your are entitled to 10% of each installmental payment made out to you by our clients.
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo< at >vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] sata_rcar: clear STOP bit in bmdma_start() method

Sergei Shtylyov — 2013-05-23T12:14:40

Hello.

On 22-05-2013 17:12, Sergei Shtylyov wrote:





     Although bmdma_stop() also can stop DMA which is not as improbable 
(media errors, etc.). I could have wrotten a better changelog. :-/


WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo< at >vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] ata: use platform_{get,set}_drvdata()

Jingoo Han — 2013-05-23T10:41:21

Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
so we can directly pass a struct platform_device.

Also, unnecessary dev_set_drvdata() is removed, because the driver core
clears the driver data to NULL after device_release or on probe failure.

Signed-off-by: Jingoo Han <jg1.han< at >samsung.com>
---
 drivers/ata/pata_arasan_cf.c |    2 +-
 drivers/ata/pata_at91.c      |    2 +-
 drivers/ata/pata_bf54x.c     |   10 ++++------
 drivers/ata/pata_imx.c       |    2 +-
 drivers/ata/pata_mpc52xx.c   |    4 ++--
 drivers/ata/pata_pxa.c       |    2 +-
 drivers/ata/sata_fsl.c       |   14 +++++---------
 drivers/ata/sata_rcar.c      |    2 +-
 8 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 7638121..848ed32 100644
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
< at >< at > -908,7 +908,7 < at >< at > free_clk:
 
 static int arasan_cf_remove(struct platform_device *pdev)
 {
-struct ata_host *host = dev_get_drvdata(&pdev->dev);
+struct ata_host *host = platform_get_drvdata(pdev);
 struct arasan_cf_dev *acdev = host->ports[0]->private_data;
 
 ata_host_detach(host);
diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index 033f3f4..5364f97 100644
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
< at >< at > -422,7 +422,7 < at >< at > err_put:
 
 static int pata_at91_remove(struct platform_device *pdev)
 {
-struct ata_host *host = dev_get_drvdata(&pdev->dev);
+struct ata_host *host = platform_get_drvdata(pdev);
 struct at91_ide_info *info;
 
 if (!host)
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 8d43510..ba0d8a2 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
< at >< at > -1596,7 +1596,7 < at >< at > static int bfin_atapi_probe(struct platform_device *pdev)
 return -ENODEV;
 }
 
-dev_set_drvdata(&pdev->dev, host);
+platform_set_drvdata(pdev, host);
 
 return 0;
 }
< at >< at > -1610,11 +1610,9 < at >< at > static int bfin_atapi_probe(struct platform_device *pdev)
  */
 static int bfin_atapi_remove(struct platform_device *pdev)
 {
-struct device *dev = &pdev->dev;
-struct ata_host *host = dev_get_drvdata(dev);
+struct ata_host *host = platform_get_drvdata(pdev);
 
 ata_host_detach(host);
-dev_set_drvdata(&pdev->dev, NULL);
 
 peripheral_free_list(atapi_io_port);
 
< at >< at > -1624,7 +1622,7 < at >< at > static int bfin_atapi_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM
 static int bfin_atapi_suspend(struct platform_device *pdev, pm_message_t state)
 {
-struct ata_host *host = dev_get_drvdata(&pdev->dev);
+struct ata_host *host = platform_get_drvdata(pdev);
 if (host)
 return ata_host_suspend(host, state);
 else
< at >< at > -1633,7 +1631,7 < at >< at > static int bfin_atapi_suspend(struct platform_device *pdev, pm_message_t state)
 
 static int bfin_atapi_resume(struct platform_device *pdev)
 {
-struct ata_host *host = dev_get_drvdata(&pdev->dev);
+struct ata_host *host = platform_get_drvdata(pdev);
 int ret;
 
 if (host) {
diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c
index aa3d166..4ec7c04 100644
--- a/drivers/ata/pata_imx.c
+++ b/drivers/ata/pata_imx.c
< at >< at > -177,7 +177,7 < at >< at > err:
 
 static int pata_imx_remove(struct platform_device *pdev)
 {
-struct ata_host *host = dev_get_drvdata(&pdev->dev);
+struct ata_host *host = platform_get_drvdata(pdev);
 struct pata_imx_priv *priv = host->private_data;
 
 ata_host_detach(host);
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 3a8fb28..0024ced 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
< at >< at > -825,7 +825,7 < at >< at > mpc52xx_ata_remove(struct platform_device *op)
 static int
 mpc52xx_ata_suspend(struct platform_device *op, pm_message_t state)
 {
-struct ata_host *host = dev_get_drvdata(&op->dev);
+struct ata_host *host = platform_get_drvdata(op);
 
 return ata_host_suspend(host, state);
 }
< at >< at > -833,7 +833,7 < at >< at > mpc52xx_ata_suspend(struct platform_device *op, pm_message_t state)
 static int
 mpc52xx_ata_resume(struct platform_device *op)
 {
-struct ata_host *host = dev_get_drvdata(&op->dev);
+struct ata_host *host = platform_get_drvdata(op);
 struct mpc52xx_ata_priv *priv = host->private_data;
 int rv;
 
diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c
index b0ac9e0..942ef94 100644
--- a/drivers/ata/pata_pxa.c
+++ b/drivers/ata/pata_pxa.c
< at >< at > -371,7 +371,7 < at >< at > static int pxa_ata_probe(struct platform_device *pdev)
 
 static int pxa_ata_remove(struct platform_device *pdev)
 {
-struct ata_host *host = dev_get_drvdata(&pdev->dev);
+struct ata_host *host = platform_get_drvdata(pdev);
 struct pata_pxa_data *data = host->ports[0]->private_data;
 
 pxa_free_dma(data->dma_channel);
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index d40e403..19720a0 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
< at >< at > -1532,7 +1532,7 < at >< at > static int sata_fsl_probe(struct platform_device *ofdev)
 ata_host_activate(host, irq, sata_fsl_interrupt, SATA_FSL_IRQ_FLAG,
   &sata_fsl_sht);
 
-dev_set_drvdata(&ofdev->dev, host);
+platform_set_drvdata(ofdev, host);
 
 host_priv->intr_coalescing.show = fsl_sata_intr_coalescing_show;
 host_priv->intr_coalescing.store = fsl_sata_intr_coalescing_store;
< at >< at > -1558,10 +1558,8 < at >< at > static int sata_fsl_probe(struct platform_device *ofdev)
 
 error_exit_with_cleanup:
 
-if (host) {
-dev_set_drvdata(&ofdev->dev, NULL);
+if (host)
 ata_host_detach(host);
-}
 
 if (hcr_base)
 iounmap(hcr_base);
< at >< at > -1572,7 +1570,7 < at >< at > error_exit_with_cleanup:
 
 static int sata_fsl_remove(struct platform_device *ofdev)
 {
-struct ata_host *host = dev_get_drvdata(&ofdev->dev);
+struct ata_host *host = platform_get_drvdata(ofdev);
 struct sata_fsl_host_priv *host_priv = host->private_data;
 
 device_remove_file(&ofdev->dev, &host_priv->intr_coalescing);
< at >< at > -1580,8 +1578,6 < at >< at > static int sata_fsl_remove(struct platform_device *ofdev)
 
 ata_host_detach(host);
 
-dev_set_drvdata(&ofdev->dev, NULL);
-
 irq_dispose_mapping(host_priv->irq);
 iounmap(host_priv->hcr_base);
 kfree(host_priv);
< at >< at > -1592,13 +1588,13 < at >< at > static int sata_fsl_remove(struct platform_device *ofdev)
 #ifdef CONFIG_PM
 static int sata_fsl_suspend(struct platform_device *op, pm_message_t state)
 {
-struct ata_host *host = dev_get_drvdata(&op->dev);
+struct ata_host *host = platform_get_drvdata(op);
 return ata_host_suspend(host, state);
 }
 
 static int sata_fsl_resume(struct platform_device *op)
 {
-struct ata_host *host = dev_get_drvdata(&op->dev);
+struct ata_host *host = platform_get_drvdata(op);
 struct sata_fsl_host_priv *host_priv = host->private_data;
 int ret;
 void __iomem *hcr_base = host_priv->hcr_base;
diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
index a8e091a..0968cf2 100644
--- a/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
< at >< at > -826,7 +826,7 < at >< at > cleanup:
 
 static int sata_rcar_remove(struct platform_device *pdev)
 {
-struct ata_host *host = dev_get_drvdata(&pdev->dev);
+struct ata_host *host = platform_get_drvdata(pdev);
 struct sata_rcar_priv *priv = host->private_data;
 
 ata_host_detach(host);

I am Mr Chan Yuan

Chan Yuan — 2013-05-22T23:59:16

I am Mr Chan Yuan,we are looking for a representative in your country to assist us pick up funds from our clients in your location. If you are interested do get back to me for futher details with your name/address/tel.There is no financial obligation on your part. Do also note that your are entitled to 10% of each installmental payment made out to you by our clients.
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo< at >vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] MIPS: OCTEON: Rename Kconfig CAVIUM_OCTEON_REFERENCE_BOARD to CAVIUM_OCTEON_SOC

Ralf Baechle — 2013-05-22T17:14:46


Done.

  Ralf
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo< at >vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH RESEND 0/1] AHCI: Optimize interrupt processing

Jens Axboe — 2013-05-22T17:03:05

Would be most awesome, I'm sure Nic would not mind a bit of help on the
SCSI/libata side :-)

And personally, can't wait to run it on the laptop! That's right, I
alpha test on the laptop.

Re: [PATCH] MIPS: OCTEON: Rename Kconfig CAVIUM_OCTEON_REFERENCE_BOARD to CAVIUM_OCTEON_SOC

David Daney — 2013-05-22T16:13:50

Can you take v2 instead?  It has the missing watchdog adjustment that is 
not in v1.

Thanks,
David Daney


--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo< at >vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2] MIPS: OCTEON: Rename Kconfig CAVIUM_OCTEON_REFERENCE_BOARD to CAVIUM_OCTEON_SOC

David Daney — 2013-05-22T16:10:46

From: David Daney <david.daney< at >cavium.com>

CAVIUM_OCTEON_SOC most place we used to use CPU_CAVIUM_OCTEON.  This
allows us to CPU_CAVIUM_OCTEON in places where we have no OCTEON SOC.

Remove CAVIUM_OCTEON_SIMULATOR as it doesn't really do anything, we can
get the same configuration with CAVIUM_OCTEON_SOC.

Signed-off-by: David Daney <david.daney< at >cavium.com>
Cc: linux-ide< at >vger.kernel.org
Cc: linux-edac< at >vger.kernel.org
Cc: linux-i2c< at >vger.kernel.org
Cc: netdev< at >vger.kernel.org
Cc: spi-devel-general< at >lists.sourceforge.net
Cc: devel< at >driverdev.osuosl.org
Cc: linux-usb< at >vger.kernel.org
Acked-by: Greg Kroah-Hartman <gregkh< at >linuxfoundation.org>
Acked-by: Wolfram Sang <wsa< at >the-dreams.de>
Acked-by: Mauro Carvalho Chehab <mchehab< at >redhat.com>
---
It may make sense to merge this before 3.10 as it touches a ton of
Kconfigs that are more likely to experiance merge problems in a full
merge window.  Also it is only Kconfigery and no 'real' code, so there
are fewer chances of really screwing things up.

Changes from v1: White space fixes and missed conversion of
                 drivers/watchdog/Kconfig as noted by Aaro Koskinen.


 arch/mips/Kconfig                         | 19 ++-----------------
 arch/mips/cavium-octeon/Kconfig           |  6 +++++-
 arch/mips/cavium-octeon/Platform          |  8 ++++----
 arch/mips/configs/cavium_octeon_defconfig |  2 +-
 arch/mips/pci/Makefile                    |  4 ++--
 drivers/ata/Kconfig                       |  2 +-
 drivers/char/hw_random/Kconfig            |  2 +-
 drivers/edac/Kconfig                      |  6 +++---
 drivers/i2c/busses/Kconfig                |  2 +-
 drivers/net/ethernet/octeon/Kconfig       |  2 +-
 drivers/net/phy/Kconfig                   |  2 +-
 drivers/spi/Kconfig                       |  2 +-
 drivers/staging/octeon/Kconfig            |  2 +-
 drivers/usb/host/Kconfig                  |  4 ++--
 drivers/watchdog/Kconfig                  |  2 +-
 15 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 2ae8e1d..baa3fa0 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
< at >< at > -737,23 +737,8 < at >< at > config WR_PPMC
   This enables support for the Wind River MIPS32 4KC PPMC evaluation
   board, which is based on GT64120 bridge chip.
 
-config CAVIUM_OCTEON_SIMULATOR
-bool "Cavium Networks Octeon Simulator"
-select CEVT_R4K
-select 64BIT_PHYS_ADDR
-select DMA_COHERENT
-select SYS_SUPPORTS_64BIT_KERNEL
-select SYS_SUPPORTS_BIG_ENDIAN
-select SYS_SUPPORTS_HOTPLUG_CPU
-select SYS_HAS_CPU_CAVIUM_OCTEON
-select HOLES_IN_ZONE
-help
-  The Octeon simulator is software performance model of the Cavium
-  Octeon Processor. It supports simulating Octeon processors on x86
-  hardware.
-
-config CAVIUM_OCTEON_REFERENCE_BOARD
-bool "Cavium Networks Octeon reference board"
+config CAVIUM_OCTEON_SOC
+bool "Cavium Networks Octeon SoC based boards"
 select CEVT_R4K
 select 64BIT_PHYS_ADDR
 select DMA_COHERENT
diff --git a/arch/mips/cavium-octeon/Kconfig b/arch/mips/cavium-octeon/Kconfig
index 75a6df7..a12444a 100644
--- a/arch/mips/cavium-octeon/Kconfig
+++ b/arch/mips/cavium-octeon/Kconfig
< at >< at > -10,6 +10,10 < at >< at > config CAVIUM_CN63XXP1
   non-CN63XXP1 hardware, so it is recommended to select "n"
   unless it is known the workarounds are needed.
 
+endif # CPU_CAVIUM_OCTEON
+
+if CAVIUM_OCTEON_SOC
+
 config CAVIUM_OCTEON_2ND_KERNEL
 bool "Build the kernel to be used as a 2nd kernel on the same chip"
 default "n"
< at >< at > -103,4 +107,4 < at >< at > config OCTEON_ILM
   To compile this driver as a module, choose M here.  The module
   will be called octeon-ilm
 
-endif # CPU_CAVIUM_OCTEON
+endif # CAVIUM_OCTEON_SOC
diff --git a/arch/mips/cavium-octeon/Platform b/arch/mips/cavium-octeon/Platform
index 1e43ccf..8a301cb 100644
--- a/arch/mips/cavium-octeon/Platform
+++ b/arch/mips/cavium-octeon/Platform
< at >< at > -1,11 +1,11 < at >< at >
 #
 # Cavium Octeon
 #
-platform-$(CONFIG_CPU_CAVIUM_OCTEON)+= cavium-octeon/
-cflags-$(CONFIG_CPU_CAVIUM_OCTEON)+=\
+platform-$(CONFIG_CAVIUM_OCTEON_SOC)+= cavium-octeon/
+cflags-$(CONFIG_CAVIUM_OCTEON_SOC)+=\
 -I$(srctree)/arch/mips/include/asm/mach-cavium-octeon
 ifdef CONFIG_CAVIUM_OCTEON_2ND_KERNEL
-load-$(CONFIG_CPU_CAVIUM_OCTEON)+= 0xffffffff84100000
+load-$(CONFIG_CAVIUM_OCTEON_SOC)+= 0xffffffff84100000
 else
-load-$(CONFIG_CPU_CAVIUM_OCTEON)+= 0xffffffff81100000
+load-$(CONFIG_CAVIUM_OCTEON_SOC)+= 0xffffffff81100000
 endif
diff --git a/arch/mips/configs/cavium_octeon_defconfig b/arch/mips/configs/cavium_octeon_defconfig
index 014ba4b..1888e5f 100644
--- a/arch/mips/configs/cavium_octeon_defconfig
+++ b/arch/mips/configs/cavium_octeon_defconfig
< at >< at > -1,4 +1,4 < at >< at >
-CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD=y
+CONFIG_CAVIUM_OCTEON_SOC=y
 CONFIG_CAVIUM_CN63XXP1=y
 CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2
 CONFIG_SPARSEMEM_MANUAL=y
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index 2cb1d31..fa3bcd2 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
< at >< at > -54,10 +54,10 < at >< at > obj-$(CONFIG_VICTOR_MPC30X)+= fixup-mpc30x.o
 obj-$(CONFIG_ZAO_CAPCELLA)+= fixup-capcella.o
 obj-$(CONFIG_WR_PPMC)+= fixup-wrppmc.o
 obj-$(CONFIG_MIKROTIK_RB532)+= pci-rc32434.o ops-rc32434.o fixup-rc32434.o
-obj-$(CONFIG_CPU_CAVIUM_OCTEON) += pci-octeon.o pcie-octeon.o
+obj-$(CONFIG_CAVIUM_OCTEON_SOC) += pci-octeon.o pcie-octeon.o
 obj-$(CONFIG_CPU_XLR)+= pci-xlr.o
 obj-$(CONFIG_CPU_XLP)+= pci-xlp.o
 
 ifdef CONFIG_PCI_MSI
-obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o
+obj-$(CONFIG_CAVIUM_OCTEON_SOC) += msi-octeon.o
 endif
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index a5a3ebc..dc20774 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
< at >< at > -160,7 +160,7 < at >< at > config PDC_ADMA
 
 config PATA_OCTEON_CF
 tristate "OCTEON Boot Bus Compact Flash support"
-depends on CPU_CAVIUM_OCTEON
+depends on CAVIUM_OCTEON_SOC
 help
   This option enables a polled compact flash driver for use with
   compact flash cards attached to the OCTEON boot bus.
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index 2f9dbf7..40a8654 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
< at >< at > -167,7 +167,7 < at >< at > config HW_RANDOM_OMAP
 
 config HW_RANDOM_OCTEON
 tristate "Octeon Random Number Generator support"
-depends on HW_RANDOM && CPU_CAVIUM_OCTEON
+depends on HW_RANDOM && CAVIUM_OCTEON_SOC
 default HW_RANDOM
 ---help---
   This driver provides kernel-side support for the Random Number
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index e443f2c1..923d2e8 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
< at >< at > -349,21 +349,21 < at >< at > config EDAC_OCTEON_PC
 
 config EDAC_OCTEON_L2C
 tristate "Cavium Octeon Secondary Caches (L2C)"
-depends on EDAC_MM_EDAC && CPU_CAVIUM_OCTEON
+depends on EDAC_MM_EDAC && CAVIUM_OCTEON_SOC
 help
   Support for error detection and correction on the
   Cavium Octeon family of SOCs.
 
 config EDAC_OCTEON_LMC
 tristate "Cavium Octeon DRAM Memory Controller (LMC)"
-depends on EDAC_MM_EDAC && CPU_CAVIUM_OCTEON
+depends on EDAC_MM_EDAC && CAVIUM_OCTEON_SOC
 help
   Support for error detection and correction on the
   Cavium Octeon family of SOCs.
 
 config EDAC_OCTEON_PCI
 tristate "Cavium Octeon PCI Controller"
-depends on EDAC_MM_EDAC && PCI && CPU_CAVIUM_OCTEON
+depends on EDAC_MM_EDAC && PCI && CAVIUM_OCTEON_SOC
 help
   Support for error detection and correction on the
   Cavium Octeon family of SOCs.
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 631736e..a8fff77 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
< at >< at > -726,7 +726,7 < at >< at > config I2C_VERSATILE
 
 config I2C_OCTEON
 tristate "Cavium OCTEON I2C bus support"
-depends on CPU_CAVIUM_OCTEON
+depends on CAVIUM_OCTEON_SOC
 help
   Say yes if you want to support the I2C serial bus on Cavium
   OCTEON SOC.
diff --git a/drivers/net/ethernet/octeon/Kconfig b/drivers/net/ethernet/octeon/Kconfig
index 3de52ff..a7aa280 100644
--- a/drivers/net/ethernet/octeon/Kconfig
+++ b/drivers/net/ethernet/octeon/Kconfig
< at >< at > -4,7 +4,7 < at >< at >
 
 config OCTEON_MGMT_ETHERNET
 tristate "Octeon Management port ethernet driver (CN5XXX, CN6XXX)"
-depends on  CPU_CAVIUM_OCTEON
+depends on CAVIUM_OCTEON_SOC
 select PHYLIB
 select MDIO_OCTEON
 default y
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 1e11f2b..84461e8 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
< at >< at > -135,7 +135,7 < at >< at > config MDIO_GPIO
 
 config MDIO_OCTEON
 tristate "Support for MDIO buses on Octeon SOCs"
-depends on  CPU_CAVIUM_OCTEON
+depends on CAVIUM_OCTEON_SOC
 default y
 help
 
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 92a9345..2015897 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
< at >< at > -266,7 +266,7 < at >< at > config SPI_OC_TINY
 
 config SPI_OCTEON
 tristate "Cavium OCTEON SPI controller"
-depends on CPU_CAVIUM_OCTEON
+depends on CAVIUM_OCTEON_SOC
 help
   SPI host driver for the hardware found on some Cavium OCTEON
   SOCs.
diff --git a/drivers/staging/octeon/Kconfig b/drivers/staging/octeon/Kconfig
index 9493128..6e1d5f8 100644
--- a/drivers/staging/octeon/Kconfig
+++ b/drivers/staging/octeon/Kconfig
< at >< at > -1,6 +1,6 < at >< at >
 config OCTEON_ETHERNET
 tristate "Cavium Networks Octeon Ethernet support"
-depends on CPU_CAVIUM_OCTEON && NETDEVICES
+depends on CAVIUM_OCTEON_SOC && NETDEVICES
 select PHYLIB
 select MDIO_OCTEON
 help
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index de94f26..00861ba 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
< at >< at > -285,7 +285,7 < at >< at > config USB_EHCI_HCD_PLATFORM
 
 config USB_OCTEON_EHCI
 bool "Octeon on-chip EHCI support"
-depends on CPU_CAVIUM_OCTEON
+depends on CAVIUM_OCTEON_SOC
 default n
 select USB_EHCI_BIG_ENDIAN_MMIO
 help
< at >< at > -480,7 +480,7 < at >< at > config USB_OHCI_HCD_PLATFORM
 
 config USB_OCTEON_OHCI
 bool "Octeon on-chip OHCI support"
-depends on CPU_CAVIUM_OCTEON
+depends on CAVIUM_OCTEON_SOC
 default USB_OCTEON_EHCI
 select USB_OHCI_BIG_ENDIAN_MMIO
 select USB_OHCI_LITTLE_ENDIAN
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index e89fc31..9d03af1 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
< at >< at > -1072,7 +1072,7 < at >< at > config TXX9_WDT
 
 config OCTEON_WDT
 tristate "Cavium OCTEON SOC family Watchdog Timer"
-depends on CPU_CAVIUM_OCTEON
+depends on CAVIUM_OCTEON_SOC
 default y
 select EXPORT_UASM if OCTEON_WDT = m
 help

Re: [PATCH RESEND 0/1] AHCI: Optimize interrupt processing

Alexander Gordeev — 2013-05-22T14:39:24

I am not committing, but will look into it, sure.

Re: [PATCH] sata_rcar: clear STOP bit in bmdma_start() method

Sergei Shtylyov — 2013-05-22T13:12:48

Hello.

On 22-05-2013 3:41, Tejun Heo wrote:




    Thanks, I forgot about -stable. Anyway, it doesn't seem that serious 
as bmdma_setup() usually shouldn't abort DMA.


WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo< at >vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] AHCI: Make distinct names for ports in /proc/interrupts /proc/interrupts

Tejun Heo — 2013-05-21T23:55:19

I've refreshed on top of libata/for-3.11 and applied it.  If I broke
something, please let me know.

Thanks a lot!

From b29900e62598cecd519c9ab2b8e4d03f8ebf702d Mon Sep 17 00:00:00 2001
From: Alexander Gordeev <agordeev< at >redhat.com>
Date: Wed, 22 May 2013 08:53:48 +0900

Currently all interrupts assigned to AHCI ports show up in
'/proc/interrupts' as 'ahci'. This fix adds port numbers as
suffixes and hence makes the descriptions distinct.

Reported-by: Jan Beulich <JBeulich< at >suse.com>
Signed-off-by: Alexander Gordeev <agordeev< at >redhat.com>
Signed-off-by: Tejun Heo <tj< at >kernel.org>
---
 drivers/ata/ahci.c    |  4 +++-
 drivers/ata/ahci.h    |  1 +
 drivers/ata/libahci.c | 10 ++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 251e57d..4d1c672 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
< at >< at > -1142,9 +1142,11 < at >< at > int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis)
 return rc;
 
 for (i = 0; i < host->n_ports; i++) {
+struct ahci_port_priv *pp = host->ports[i]->private_data;
+
 rc = devm_request_threaded_irq(host->dev,
 irq + i, ahci_hw_interrupt, ahci_thread_fn, IRQF_SHARED,
-dev_driver_string(host->dev), host->ports[i]);
+pp->irq_desc, host->ports[i]);
 if (rc)
 goto out_free_irqs;
 }
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index b830e6c..05adf29 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
< at >< at > -306,6 +306,7 < at >< at > struct ahci_port_priv {
 intfbs_last_dev;/* save FBS.DEV of last FIS */
 /* enclosure management info per PM slot */
 struct ahci_em_privem_priv[EM_MAX_SLOTS];
+char*irq_desc;/* desc in /proc/interrupts */
 };
 
 struct ahci_host_priv {
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 34c8216..3797a7b 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
< at >< at > -2234,6 +2234,16 < at >< at > static int ahci_port_start(struct ata_port *ap)
 if (!pp)
 return -ENOMEM;
 
+if (ap->host->n_ports > 1) {
+pp->irq_desc = devm_kzalloc(dev, 8, GFP_KERNEL);
+if (!pp->irq_desc) {
+devm_kfree(dev, pp);
+return -ENOMEM;
+}
+snprintf(pp->irq_desc, 8,
+ "%s%d", dev_driver_string(dev), ap->port_no);
+}
+
 /* check FBS capability */
 if ((hpriv->cap & HOST_CAP_FBS) && sata_pmp_supported(ap)) {
 void __iomem *port_mmio = ahci_port_base(ap);

Re: [PATCH RESEND 0/1] AHCI: Optimize interrupt processing

Tejun Heo — 2013-05-21T23:50:03

Hello, Alexander.

(cc'ing Jens and Nicholas, hey guys)

On Tue, May 21, 2013 at 09:00:27PM +0200, Alexander Gordeev wrote:

Hmmmmmm..... I'd normally apply this patch but block layer is just
growing multi-queue support and libata is likely to be converted to mq
in foreseeable future, so I'm a bit hesitant to make irq handling more
sophiscated right now.  Would you be interested in looking into
converting libata to blk mq support?  I'm pretty sure it'd yield far
better outcome if done properly.

Thanks.

Re: [PATCH] sata_rcar: clear STOP bit in bmdma_start() method

Tejun Heo — 2013-05-21T23:41:28

Applied to libata/for-3.10-fixes w/ stable cc'd.

Thanks.

[PATCH 2/2] libata: Add atapi_dmadir force flag

Tejun Heo — 2013-05-21T23:35:18

Applied to libata/for-3.11.  Thanks a lot!

From 966fbe193f47c68e70a80ec9991098e88e7959cb Mon Sep 17 00:00:00 2001
From: Vincent Pelletier <plr.vincent< at >gmail.com>
Date: Tue, 21 May 2013 22:30:58 +0200

Some device require DMADIR to be enabled, but are not detected as such
by atapi_id_dmadir.  One such example is "Asus Serillel 2"
SATA-host-to-PATA-device bridge: the bridge itself requires DMADIR,
even if the bridged device does not.

As atapi_dmadir module parameter can cause problems with some devices
(as per Tejun Heo's memory), enabling it globally may not be possible
depending on the hardware.

This patch adds atapi_dmadir in the form of a "force" horkage value,
allowing global, per-bus and per-device control.

Signed-off-by: Vincent Pelletier <plr.vincent< at >gmail.com>
Signed-off-by: Tejun Heo <tj< at >kernel.org>
---
 Documentation/kernel-parameters.txt | 2 ++
 drivers/ata/libata-core.c           | 3 ++-
 include/linux/libata.h              | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c3bfacb..489815e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
< at >< at > -1456,6 +1456,8 < at >< at > bytes respectively. Such letter suffixes can also be entirely omitted.
 
 * dump_id: dump IDENTIFY data.
 
+* atapi_dmadir: Enable ATAPI DMADIR bridge support
+
 If there are multiple matching configurations changing
 the same attribute, the last one is used.
 
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 5f7d5f9..c97a244 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
< at >< at > -2395,7 +2395,7 < at >< at > int ata_dev_configure(struct ata_device *dev)
 cdb_intr_string = ", CDB intr";
 }
 
-if (atapi_dmadir || atapi_id_dmadir(dev->id)) {
+if (atapi_dmadir || (dev->horkage & ATA_HORKAGE_ATAPI_DMADIR) || atapi_id_dmadir(dev->id)) {
 dev->flags |= ATA_DFLAG_DMADIR;
 dma_dir_string = ", DMADIR";
 }
< at >< at > -6496,6 +6496,7 < at >< at > static int __init ata_parse_force_one(char **cur,
 { "nosrst",.lflags= ATA_LFLAG_NO_SRST },
 { "norst",.lflags= ATA_LFLAG_NO_HRST | ATA_LFLAG_NO_SRST },
 { "rstonce",.lflags= ATA_LFLAG_RST_ONCE },
+{ "atapi_dmadir", .horkage_on= ATA_HORKAGE_ATAPI_DMADIR },
 };
 char *start = *cur, *p = *cur;
 char *id, *val, *endp;
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 47e0292..c886dc87 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
< at >< at > -399,6 +399,7 < at >< at > enum {
 ATA_HORKAGE_BROKEN_FPDMA_AA= (1 << 15),/* skip AA */
 ATA_HORKAGE_DUMP_ID= (1 << 16),/* dump IDENTIFY data */
 ATA_HORKAGE_MAX_SEC_LBA48 = (1 << 17),/* Set max sects to 65535 */
+ATA_HORKAGE_ATAPI_DMADIR = (1 << 18),/* device requires dmadir */
 
  /* DMA mask for user DMA control: User visible values; DO NOT
     renumber */

[PATCH 1/2] libata: make ata_exec_internal_sg honor DMADIR

Tejun Heo — 2013-05-21T23:32:58

Applied to libata/for-3.10-fixes w/ stable cc'd.

Thanks a lot!

From e771451c0a831d96a7c14b0ca8a8ec671d98567b Mon Sep 17 00:00:00 2001
From: Vincent Pelletier <plr.vincent< at >gmail.com>
Date: Sat, 18 May 2013 18:44:04 +0200
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

libata honors DMADIR for regular commands, but not for internal commands
used (among other) during device initialisation.

This makes SATA-host-to-PATA-device bridges based on Silicon Image SiL3611
(such as "Abit Serillel 2") end up disabled when used with an ATAPI device
after a few tries.

Log output of the bridge being hot-plugged with an ATAPI drive:

  [ 9631.212901] ata1: exception Emask 0x10 SAct 0x0 SErr 0x40c0000 action 0xe frozen
  [ 9631.212913] ata1: irq_stat 0x00000040, connection status changed
  [ 9631.212923] ata1: SError: { CommWake 10B8B DevExch }
  [ 9631.212939] ata1: hard resetting link
  [ 9632.104962] ata1: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
  [ 9632.106393] ata1.00: ATAPI: PIONEER DVD-RW  DVR-115, 1.06, max UDMA/33
  [ 9632.106407] ata1.00: applying bridge limits
  [ 9632.108151] ata1.00: configured for UDMA/33
  [ 9637.105303] ata1.00: qc timeout (cmd 0xa0)
  [ 9637.105324] ata1.00: failed to clear UNIT ATTENTION (err_mask=0x5)
  [ 9637.105335] ata1: hard resetting link
  [ 9638.044599] ata1: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
  [ 9638.047878] ata1.00: configured for UDMA/33
  [ 9643.044933] ata1.00: qc timeout (cmd 0xa0)
  [ 9643.044953] ata1.00: failed to clear UNIT ATTENTION (err_mask=0x5)
  [ 9643.044963] ata1: limiting SATA link speed to 1.5 Gbps
  [ 9643.044971] ata1.00: limiting speed to UDMA/33:PIO3
  [ 9643.044979] ata1: hard resetting link
  [ 9643.984225] ata1: SATA link up 1.5 Gbps (SStatus 113 SControl 310)
  [ 9643.987471] ata1.00: configured for UDMA/33
  [ 9648.984591] ata1.00: qc timeout (cmd 0xa0)
  [ 9648.984612] ata1.00: failed to clear UNIT ATTENTION (err_mask=0x5)
  [ 9648.984619] ata1.00: disabled
  [ 9649.000593] ata1: hard resetting link
  [ 9649.939902] ata1: SATA link up 1.5 Gbps (SStatus 113 SControl 310)
  [ 9649.955864] ata1: EH complete

With this patch, the drive enumerates correctly when libata is loaded with
atapi_dmadir=1:

  [ 9891.810863] ata1: exception Emask 0x10 SAct 0x0 SErr 0x40c0000 action 0xe frozen
  [ 9891.810874] ata1: irq_stat 0x00000040, connection status changed
  [ 9891.810884] ata1: SError: { CommWake 10B8B DevExch }
  [ 9891.810900] ata1: hard resetting link
  [ 9892.762105] ata1: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
  [ 9892.763544] ata1.00: ATAPI: PIONEER DVD-RW  DVR-115, 1.06, max UDMA/33, DMADIR
  [ 9892.763558] ata1.00: applying bridge limits
  [ 9892.765393] ata1.00: configured for UDMA/33
  [ 9892.786063] ata1: EH complete
  [ 9892.792062] scsi 0:0:0:0: CD-ROM            PIONEER  DVD-RW  DVR-115  1.06 PQ: 0 ANSI: 5
  [ 9892.798455] sr2: scsi3-mmc drive: 12x/12x writer dvd-ram cd/rw xa/form2 cdda tray
  [ 9892.798837] sr 0:0:0:0: Attached scsi CD-ROM sr2
  [ 9892.799109] sr 0:0:0:0: Attached scsi generic sg6 type 5

Based on a patch by Csaba Halász <csaba.halasz< at >gmail.com> on linux-ide:
http://marc.info/?l=linux-ide&m=136121147832295&w=2

tj: minor formatting changes.

Signed-off-by: Vincent Pelletier <plr.vincent< at >gmail.com>
Signed-off-by: Tejun Heo <tj< at >kernel.org>
Cc: stable< at >vger.kernel.org
---
 drivers/ata/libata-core.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index d35524c..f218427 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
< at >< at > -1602,6 +1602,12 < at >< at > unsigned ata_exec_internal_sg(struct ata_device *dev,
 qc->tf = *tf;
 if (cdb)
 memcpy(qc->cdb, cdb, ATAPI_CDB_LEN);
+
+/* some SATA bridges need us to indicate data xfer direction */
+if (tf->protocol == ATAPI_PROT_DMA && (dev->flags & ATA_DFLAG_DMADIR) &&
+    dma_dir == DMA_FROM_DEVICE)
+qc->tf.feature |= ATAPI_DMADIR;
+
 qc->flags |= ATA_QCFLAG_RESULT_TF;
 qc->dma_dir = dma_dir;
 if (dma_dir != DMA_NONE) {

Re: [PATCH] MIPS: OCTEON: Rename Kconfig CAVIUM_OCTEON_REFERENCE_BOARD to CAVIUM_OCTEON_SOC

David Daney — 2013-05-21T22:07:23

Good point.  I will regenerate the patch to correct this.

Thanks,
David Daney



--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo< at >vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] make ata_exec_internal_sg honor DMADIR

Vincent Pelletier — 2013-05-21T20:37:25

Hi.

Attached should be the final patches, unless someone has objections.

Changes since previous version:
- noatapi_dmadir dropped
- flag documented
- slight change to 2/2 commit message
- tested

Regards,

[PATCH] ipr: qc_fill_rtf() method should not store alternate status register

Sergei Shtylyov — 2013-05-21T19:24:22

The 'ctl' field of  the 'struct ata_taskfile' is not really dual purpose, i.e.
it is not intended  for storing the alternate status register (which is mapped
at the same address in the legacy IDE controllers) in the qc_fill_rtf() method.
No other 'libata' driver except 'drivers/scsi/ipr.c' stores the alternate status
register's value in the 'ctl' field of 'qc->result_tf', hence this driver should
not do this as well...

Signed-off-by: Sergei Shtylyov <sergei.shtylyov< at >cogentembedded.com>

---
The patch is against the recent Linus' tree.

 drivers/scsi/ipr.c |    1 -
 1 file changed, 1 deletion(-)

Index: linux/drivers/scsi/ipr.c
===================================================================
--- linux.orig/drivers/scsi/ipr.c
+++ linux/drivers/scsi/ipr.c
< at >< at > -6662,7 +6662,6 < at >< at > static bool ipr_qc_fill_rtf(struct ata_q
 tf->hob_lbal = g->hob_lbal;
 tf->hob_lbam = g->hob_lbam;
 tf->hob_lbah = g->hob_lbah;
-tf->ctl = g->alt_status;
 
 return true;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo< at >vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] sata_rcar: clear STOP bit in bmdma_start() method

Sergei Shtylyov — 2013-05-21T19:07:54

Iff bmdma_setup() has to stop a DMA transfer before starting a new one, then the
STOP bit in the ATAPI_CONTROL1 register will remain set (it's only cleared when
setting the START bit to 1) and then bmdma_start() method will set both START
and STOP bits simultaneously which should abort the transfer being just started.
Avoid that by explicitly clearing the STOP bit in bmdma_start() method (in this
case it will be ignored on write).

Signed-off-by: Sergei Shtylyov <sergei.shtylyov< at >cogentembedded.com>

---
This patch is against 'for-3.10-fixes' branch of Tejun Heo's 'libata.git' repo.

 drivers/ata/sata_rcar.c |    1 +
 1 file changed, 1 insertion(+)

Index: libata/drivers/ata/sata_rcar.c
===================================================================
--- libata.orig/drivers/ata/sata_rcar.c
+++ libata/drivers/ata/sata_rcar.c
< at >< at > -549,6 +549,7 < at >< at > static void sata_rcar_bmdma_start(struct
 
 /* start host DMA transaction */
 dmactl = ioread32(priv->base + ATAPI_CONTROL1_REG);
+dmactl &= ~ATAPI_CONTROL1_STOP;
 dmactl |= ATAPI_CONTROL1_START;
 iowrite32(dmactl, priv->base + ATAPI_CONTROL1_REG);
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo< at >vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH RESEND 1/1] AHCI: Make distinct names for ports in /proc/interrupts

Alexander Gordeev — 2013-05-21T19:03:40

Currently all interrupts assigned to AHCI ports show up in
'/proc/interrupts' as 'ahci'. This fix adds port numbers as
suffixes and hence makes the descriptions distinct.

Reported-by: Jan Beulich <JBeulich< at >suse.com>
Signed-off-by: Alexander Gordeev <agordeev< at >redhat.com>
---
 drivers/ata/ahci.c    |    5 +++--
 drivers/ata/ahci.h    |    1 +
 drivers/ata/libahci.c |   10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index e4d915f..32dd3e2 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
< at >< at > -1148,10 +1148,11 < at >< at > int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis,
 return -EINVAL;
 
 for (i = 0; i < n_irqs; i++) {
+struct ahci_port_priv *pp = host->ports[i]->private_data;
+
 rc = devm_request_threaded_irq(host->dev, irq + i,
 ahci_multi_irqs_intr, ahci_port_thread_fn,
-IRQF_SHARED, dev_driver_string(host->dev),
-host->ports[i]);
+IRQF_SHARED, pp->irq_desc, host->ports[i]);
 if (rc)
 goto out_free_irqs;
 }
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index ed1fbc8..7386dfd 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
< at >< at > -305,6 +305,7 < at >< at > struct ahci_port_priv {
 intfbs_last_dev;/* save FBS.DEV of last FIS */
 /* enclosure management info per PM slot */
 struct ahci_em_privem_priv[EM_MAX_SLOTS];
+char*irq_desc;/* desc in /proc/interrupts */
 };
 
 struct ahci_host_priv {
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 68b3bdd..2b56769 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
< at >< at > -2251,6 +2251,16 < at >< at > static int ahci_port_start(struct ata_port *ap)
 if (!pp)
 return -ENOMEM;
 
+if (ap->host->n_ports > 1) {
+pp->irq_desc = devm_kzalloc(dev, 8, GFP_KERNEL);
+if (!pp->irq_desc) {
+devm_kfree(dev, pp);
+return -ENOMEM;
+}
+snprintf(pp->irq_desc, 8,
+ "%s%d", dev_driver_string(dev), ap->port_no);
+}
+
 /* check FBS capability */
 if ((hpriv->cap & HOST_CAP_FBS) && sata_pmp_supported(ap)) {
 void __iomem *port_mmio = ahci_port_base(ap);