* [PATCH 1/3] pci_ids: Add AMD KERNCZ device ID support
@ 2015-06-06 13:13 ` Wan ZongShun
0 siblings, 0 replies; 8+ messages in thread
From: Wan ZongShun @ 2015-06-06 13:13 UTC (permalink / raw)
To: ulf.hansson, linux-mmc, linux-i2c, bp, jdelvare
Cc: linux-pci, linux-kernel, Wan ZongShun, Wan ZongShun
The KERNCZ is new AMD SB/FCH generation name, like HUDSON2.
We will adopt 0x790b as device ID since from this gereration.
Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com>
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
---
include/linux/pci_ids.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2f7b9a4..cb63a7b 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -579,6 +579,7 @@
#define PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE 0x7800
#define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS 0x780b
#define PCI_DEVICE_ID_AMD_HUDSON2_IDE 0x780c
+#define PCI_DEVICE_ID_AMD_KERNCZ_SMBUS 0x790b
#define PCI_VENDOR_ID_TRIDENT 0x1023
#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/3] pci_ids: Add AMD KERNCZ device ID support
@ 2015-06-06 13:13 ` Wan ZongShun
0 siblings, 0 replies; 8+ messages in thread
From: Wan ZongShun @ 2015-06-06 13:13 UTC (permalink / raw)
To: ulf.hansson, linux-mmc, linux-i2c, bp, jdelvare
Cc: linux-pci, linux-kernel, Wan ZongShun, Wan ZongShun
The KERNCZ is new AMD SB/FCH generation name, like HUDSON2.
We will adopt 0x790b as device ID since from this gereration.
Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com>
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
---
include/linux/pci_ids.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 2f7b9a4..cb63a7b 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -579,6 +579,7 @@
#define PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE 0x7800
#define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS 0x780b
#define PCI_DEVICE_ID_AMD_HUDSON2_IDE 0x780c
+#define PCI_DEVICE_ID_AMD_KERNCZ_SMBUS 0x790b
#define PCI_VENDOR_ID_TRIDENT 0x1023
#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] i2c-piix4: Use Macro for AMD CZ SMBus device ID
2015-06-06 13:13 ` Wan ZongShun
@ 2015-06-06 13:13 ` Wan ZongShun
-1 siblings, 0 replies; 8+ messages in thread
From: Wan ZongShun @ 2015-06-06 13:13 UTC (permalink / raw)
To: ulf.hansson, linux-mmc, linux-i2c, bp, jdelvare
Cc: linux-pci, linux-kernel, Wan ZongShun, Wan ZongShun
Change AMD CZ SMBUS device ID from 0x790b to
use Macro definition
Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com>
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
---
drivers/i2c/busses/i2c-piix4.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 67cbec6..630bce6 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -245,7 +245,7 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
PIIX4_dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS &&
PIIX4_dev->revision >= 0x41) ||
(PIIX4_dev->vendor == PCI_VENDOR_ID_AMD &&
- PIIX4_dev->device == 0x790b &&
+ PIIX4_dev->device == PCI_DEVICE_ID_AMD_KERNCZ_SMBUS &&
PIIX4_dev->revision >= 0x49))
smb_en = 0x00;
else
@@ -545,7 +545,7 @@ static const struct pci_device_id piix4_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) },
{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) },
- { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x790b) },
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_KERNCZ_SMBUS) },
{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
PCI_DEVICE_ID_SERVERWORKS_OSB4) },
{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] i2c-piix4: Use Macro for AMD CZ SMBus device ID
@ 2015-06-06 13:13 ` Wan ZongShun
0 siblings, 0 replies; 8+ messages in thread
From: Wan ZongShun @ 2015-06-06 13:13 UTC (permalink / raw)
To: ulf.hansson, linux-mmc, linux-i2c, bp, jdelvare
Cc: linux-pci, linux-kernel, Wan ZongShun, Wan ZongShun
Change AMD CZ SMBUS device ID from 0x790b to
use Macro definition
Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com>
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
---
drivers/i2c/busses/i2c-piix4.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 67cbec6..630bce6 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -245,7 +245,7 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev,
PIIX4_dev->device == PCI_DEVICE_ID_AMD_HUDSON2_SMBUS &&
PIIX4_dev->revision >= 0x41) ||
(PIIX4_dev->vendor == PCI_VENDOR_ID_AMD &&
- PIIX4_dev->device == 0x790b &&
+ PIIX4_dev->device == PCI_DEVICE_ID_AMD_KERNCZ_SMBUS &&
PIIX4_dev->revision >= 0x49))
smb_en = 0x00;
else
@@ -545,7 +545,7 @@ static const struct pci_device_id piix4_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) },
{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS) },
- { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x790b) },
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_KERNCZ_SMBUS) },
{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
PCI_DEVICE_ID_SERVERWORKS_OSB4) },
{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] SDHCI: Change AMD SDHCI quirk application scope
2015-06-06 13:13 ` Wan ZongShun
@ 2015-06-06 13:13 ` Wan ZongShun
-1 siblings, 0 replies; 8+ messages in thread
From: Wan ZongShun @ 2015-06-06 13:13 UTC (permalink / raw)
To: ulf.hansson, linux-mmc, linux-i2c, bp, jdelvare
Cc: linux-pci, linux-kernel, Wan ZongShun, Wan ZongShun
Change this quirk to apply to AMD Carrizo platform.
Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com>
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
Tested-by: Nath, Arindam <Arindam.Nath@amd.com>
Tested-by: Ramesh, Ramya <Ramya.Ramesh@amd.com>
---
drivers/mmc/host/sdhci-pci.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index f208f20..94f54d2 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -724,14 +724,37 @@ static const struct sdhci_pci_fixes sdhci_rtsx = {
.probe_slot = rtsx_probe_slot,
};
+/*AMD chipset generation*/
+enum amd_chipset_gen {
+ AMD_CHIPSET_BEFORE_ML,
+ AMD_CHIPSET_CZ,
+ AMD_CHIPSET_NL,
+ AMD_CHIPSET_UNKNOWN,
+};
+
static int amd_probe(struct sdhci_pci_chip *chip)
{
struct pci_dev *smbus_dev;
+ enum amd_chipset_gen gen;
smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD,
PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, NULL);
+ if (smbus_dev) {
+ gen = AMD_CHIPSET_BEFORE_ML;
+ } else {
+ smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD,
+ PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, NULL);
+ if (smbus_dev) {
+ if (smbus_dev->revision < 0x51)
+ gen = AMD_CHIPSET_CZ;
+ else
+ gen = AMD_CHIPSET_NL;
+ } else {
+ gen = AMD_CHIPSET_UNKNOWN;
+ }
+ }
- if (smbus_dev && (smbus_dev->revision < 0x51)) {
+ if ((gen == AMD_CHIPSET_BEFORE_ML) || (gen == AMD_CHIPSET_CZ)) {
chip->quirks2 |= SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD;
chip->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] SDHCI: Change AMD SDHCI quirk application scope
@ 2015-06-06 13:13 ` Wan ZongShun
0 siblings, 0 replies; 8+ messages in thread
From: Wan ZongShun @ 2015-06-06 13:13 UTC (permalink / raw)
To: ulf.hansson, linux-mmc, linux-i2c, bp, jdelvare
Cc: linux-pci, linux-kernel, Wan ZongShun, Wan ZongShun
Change this quirk to apply to AMD Carrizo platform.
Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com>
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
Tested-by: Nath, Arindam <Arindam.Nath@amd.com>
Tested-by: Ramesh, Ramya <Ramya.Ramesh@amd.com>
---
drivers/mmc/host/sdhci-pci.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index f208f20..94f54d2 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -724,14 +724,37 @@ static const struct sdhci_pci_fixes sdhci_rtsx = {
.probe_slot = rtsx_probe_slot,
};
+/*AMD chipset generation*/
+enum amd_chipset_gen {
+ AMD_CHIPSET_BEFORE_ML,
+ AMD_CHIPSET_CZ,
+ AMD_CHIPSET_NL,
+ AMD_CHIPSET_UNKNOWN,
+};
+
static int amd_probe(struct sdhci_pci_chip *chip)
{
struct pci_dev *smbus_dev;
+ enum amd_chipset_gen gen;
smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD,
PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, NULL);
+ if (smbus_dev) {
+ gen = AMD_CHIPSET_BEFORE_ML;
+ } else {
+ smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD,
+ PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, NULL);
+ if (smbus_dev) {
+ if (smbus_dev->revision < 0x51)
+ gen = AMD_CHIPSET_CZ;
+ else
+ gen = AMD_CHIPSET_NL;
+ } else {
+ gen = AMD_CHIPSET_UNKNOWN;
+ }
+ }
- if (smbus_dev && (smbus_dev->revision < 0x51)) {
+ if ((gen == AMD_CHIPSET_BEFORE_ML) || (gen == AMD_CHIPSET_CZ)) {
chip->quirks2 |= SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD;
chip->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] pci_ids: Add AMD KERNCZ device ID support
2015-06-06 13:13 ` Wan ZongShun
` (2 preceding siblings ...)
(?)
@ 2015-06-06 17:00 ` Borislav Petkov
-1 siblings, 0 replies; 8+ messages in thread
From: Borislav Petkov @ 2015-06-06 17:00 UTC (permalink / raw)
To: Wan ZongShun
Cc: ulf.hansson, linux-mmc, linux-i2c, jdelvare, linux-pci,
linux-kernel, Wan ZongShun
On Sat, Jun 06, 2015 at 09:13:38PM +0800, Wan ZongShun wrote:
> The KERNCZ is new AMD SB/FCH generation name, like HUDSON2.
> We will adopt 0x790b as device ID since from this gereration.
>
> Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com>
> Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
You need to choose one email address, not two for the same person's
Signed-off-by line. I'd prefer the amd.com one.
For more info, please read Documentation/SubmittingPatches.
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] i2c-piix4: Use Macro for AMD CZ SMBus device ID
2015-06-06 13:13 ` Wan ZongShun
(?)
@ 2015-06-06 17:00 ` Borislav Petkov
-1 siblings, 0 replies; 8+ messages in thread
From: Borislav Petkov @ 2015-06-06 17:00 UTC (permalink / raw)
To: Wan ZongShun
Cc: ulf.hansson, linux-mmc, linux-i2c, jdelvare, linux-pci,
linux-kernel, Wan ZongShun
On Sat, Jun 06, 2015 at 09:13:39PM +0800, Wan ZongShun wrote:
> Change AMD CZ SMBUS device ID from 0x790b to
> use Macro definition
>
> Signed-off-by: Wan ZongShun <Vincent.Wan@amd.com>
> Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
Same here, one SOB per person please.
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-06-06 17:00 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-06 13:13 [PATCH 1/3] pci_ids: Add AMD KERNCZ device ID support Wan ZongShun
2015-06-06 13:13 ` Wan ZongShun
2015-06-06 13:13 ` [PATCH 2/3] i2c-piix4: Use Macro for AMD CZ SMBus device ID Wan ZongShun
2015-06-06 13:13 ` Wan ZongShun
2015-06-06 17:00 ` Borislav Petkov
2015-06-06 13:13 ` [PATCH 3/3] SDHCI: Change AMD SDHCI quirk application scope Wan ZongShun
2015-06-06 13:13 ` Wan ZongShun
2015-06-06 17:00 ` [PATCH 1/3] pci_ids: Add AMD KERNCZ device ID support Borislav Petkov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.