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 <[email protected]>
---
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
Change AMD CZ SMBUS device ID from 0x790b to
use Macro definition
Signed-off-by: Wan ZongShun <[email protected]>
---
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
Change this quirk to apply to AMD Carrizo platform.
Signed-off-by: Wan ZongShun <[email protected]>
Tested-by: Nath, Arindam <[email protected]>
Tested-by: Ramesh, Ramya <[email protected]>
---
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
On Thu, Jun 11, 2015 at 08:11:46PM +0800, Wan ZongShun wrote:
> Change AMD CZ SMBUS device ID from 0x790b to
> use Macro definition
>
> Signed-off-by: Wan ZongShun <[email protected]>
I think it makes sense that this patch goes in via MMC. This I2C change
is trivial, but for MMC there is more to handle. I don't expect
conflicts. So:
Acked-by: Wolfram Sang <[email protected]>
> ---
> 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
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jun 11, 2015 at 08:11:45PM +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.
s/We will adopt 0x790b as device ID since from/0x790b is the device ID for/
s/gereration/generation/
> Signed-off-by: Wan ZongShun <[email protected]>
Acked-by: Bjorn Helgaas <[email protected]>
> ---
> 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
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12 June 2015 at 22:34, Bjorn Helgaas <[email protected]> wrote:
> On Thu, Jun 11, 2015 at 08:11:45PM +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.
>
> s/We will adopt 0x790b as device ID since from/0x790b is the device ID for/
> s/gereration/generation/
>
>> Signed-off-by: Wan ZongShun <[email protected]>
>
> Acked-by: Bjorn Helgaas <[email protected]>
Thanks, applied with Bjorn's ack and his suggested changes.
Kind regards
Uffe
>
>> ---
>> 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
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11 June 2015 at 15:07, Wolfram Sang <[email protected]> wrote:
> On Thu, Jun 11, 2015 at 08:11:46PM +0800, Wan ZongShun wrote:
>> Change AMD CZ SMBUS device ID from 0x790b to
>> use Macro definition
>>
>> Signed-off-by: Wan ZongShun <[email protected]>
>
> I think it makes sense that this patch goes in via MMC. This I2C change
> is trivial, but for MMC there is more to handle. I don't expect
> conflicts. So:
>
> Acked-by: Wolfram Sang <[email protected]>
Thanks, applied!
Kind regards
Uffe
>
>> ---
>> 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
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11 June 2015 at 14:11, Wan ZongShun <[email protected]> wrote:
> Change this quirk to apply to AMD Carrizo platform.
>
> Signed-off-by: Wan ZongShun <[email protected]>
>
> Tested-by: Nath, Arindam <[email protected]>
> Tested-by: Ramesh, Ramya <[email protected]>
Thanks, applied! I changed the prefix of the commit message header
from "SDHCI." to "mmc: sdhci-pci:"
Kind regards
Uffe
> ---
> 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
>
On Thu, 11 Jun 2015 20:11:46 +0800, Wan ZongShun wrote:
> Change AMD CZ SMBUS device ID from 0x790b to
> use Macro definition
>
> Signed-off-by: Wan ZongShun <[email protected]>
> ---
> 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,
Probably too late but anyway:
Acked-by: Jean Delvare <[email protected]>
--
Jean Delvare
SUSE L3 Support